[PATCH 1/4] drm/i915: Propagate error from drm_fb_helper_init().

2010-06-06 Thread Chris Wilson 
Signed-off-by: Chris Wilson 
---
 drivers/gpu/drm/i915/intel_fb.c |   10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index dfbb0c6..c3c5052 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -245,6 +245,7 @@ int intel_fbdev_init(struct drm_device *dev)
 {
struct intel_fbdev *ifbdev;
drm_i915_private_t *dev_priv = dev->dev_private;
+   int ret;

ifbdev = kzalloc(sizeof(struct intel_fbdev), GFP_KERNEL);
if (!ifbdev)
@@ -253,8 +254,13 @@ int intel_fbdev_init(struct drm_device *dev)
dev_priv->fbdev = ifbdev;
ifbdev->helper.funcs = _fb_helper_funcs;

-   drm_fb_helper_init(dev, >helper, dev_priv->num_pipe,
-  INTELFB_CONN_LIMIT);
+   ret = drm_fb_helper_init(dev, >helper,
+dev_priv->num_pipe,
+INTELFB_CONN_LIMIT);
+   if (ret) {
+   kfree(ifbdev);
+   return ret;
+   }

drm_fb_helper_single_add_all_connectors(>helper);
drm_fb_helper_initial_config(>helper, 32);
-- 
1.7.1

[PATCH 1/4] drm/i915: Propagate error from drm_fb_helper_init().

2010-06-06 Thread Chris Wilson 
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
---
 drivers/gpu/drm/i915/intel_fb.c |   10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index dfbb0c6..c3c5052 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -245,6 +245,7 @@ int intel_fbdev_init(struct drm_device *dev)
 {
struct intel_fbdev *ifbdev;
drm_i915_private_t *dev_priv = dev-dev_private;
+   int ret;
 
ifbdev = kzalloc(sizeof(struct intel_fbdev), GFP_KERNEL);
if (!ifbdev)
@@ -253,8 +254,13 @@ int intel_fbdev_init(struct drm_device *dev)
dev_priv-fbdev = ifbdev;
ifbdev-helper.funcs = intel_fb_helper_funcs;
 
-   drm_fb_helper_init(dev, ifbdev-helper, dev_priv-num_pipe,
-  INTELFB_CONN_LIMIT);
+   ret = drm_fb_helper_init(dev, ifbdev-helper,
+dev_priv-num_pipe,
+INTELFB_CONN_LIMIT);
+   if (ret) {
+   kfree(ifbdev);
+   return ret;
+   }
 
drm_fb_helper_single_add_all_connectors(ifbdev-helper);
drm_fb_helper_initial_config(ifbdev-helper, 32);
-- 
1.7.1

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel