git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_fb.c
diff --git
a/drivers/gpu/drm/i915/intel_fb.c
b/drivers/gpu/drm/i915/intel_fb.c
index a79525f434a8fae8a4654927050f285ff49f20e0..7bdc96256bf55b6e87d102377b428a871792be91 100644
(file)
--- a/
drivers/gpu/drm/i915/intel_fb.c
+++ b/
drivers/gpu/drm/i915/intel_fb.c
@@
-121,7
+121,9
@@
static int intelfb_create(struct intel_fbdev *ifbdev,
info->par = ifbdev;
info->par = ifbdev;
- intel_framebuffer_init(dev, &ifbdev->ifb, &mode_cmd, fbo);
+ ret = intel_framebuffer_init(dev, &ifbdev->ifb, &mode_cmd, fbo);
+ if (ret)
+ goto out_unpin;
fb = &ifbdev->ifb.base;
fb = &ifbdev->ifb.base;