projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
omapdrm
/
omap_encoder.c
diff --git
a/drivers/gpu/drm/omapdrm/omap_encoder.c
b/drivers/gpu/drm/omapdrm/omap_encoder.c
index
7e1f2ab
..
21d126d
100644
(file)
--- a/
drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/
drivers/gpu/drm/omapdrm/omap_encoder.c
@@
-147,10
+147,8
@@
struct drm_encoder *omap_encoder_init(struct drm_device *dev,
struct omap_encoder *omap_encoder;
omap_encoder = kzalloc(sizeof(*omap_encoder), GFP_KERNEL);
- if (!omap_encoder) {
- dev_err(dev->dev, "could not allocate encoder\n");
+ if (!omap_encoder)
goto fail;
- }
omap_encoder->dssdev = dssdev;