[PATCH 3/4] drm/nouveau: Propagate error from drm_fb_helper_init()

2010-06-06 Thread Chris Wilson 
Signed-off-by: Chris Wilson 
---
 drivers/gpu/drm/nouveau/nouveau_fbcon.c |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c 
b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index fd4a2df..c9a4a0d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -377,6 +377,7 @@ int nouveau_fbcon_init(struct drm_device *dev)
 {
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fbdev *nfbdev;
+   int ret;

nfbdev = kzalloc(sizeof(struct nouveau_fbdev), GFP_KERNEL);
if (!nfbdev)
@@ -386,7 +387,12 @@ int nouveau_fbcon_init(struct drm_device *dev)
dev_priv->nfbdev = nfbdev;
nfbdev->helper.funcs = _fbcon_helper_funcs;

-   drm_fb_helper_init(dev, >helper, 2, 4);
+   ret = drm_fb_helper_init(dev, >helper, 2, 4);
+   if (ret) {
+   kfree(nfbdev);
+   return ret;
+   }
+
drm_fb_helper_single_add_all_connectors(>helper);
drm_fb_helper_initial_config(>helper, 32);
return 0;
-- 
1.7.1

[PATCH 3/4] drm/nouveau: 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/nouveau/nouveau_fbcon.c |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c 
b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index fd4a2df..c9a4a0d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -377,6 +377,7 @@ int nouveau_fbcon_init(struct drm_device *dev)
 {
struct drm_nouveau_private *dev_priv = dev-dev_private;
struct nouveau_fbdev *nfbdev;
+   int ret;
 
nfbdev = kzalloc(sizeof(struct nouveau_fbdev), GFP_KERNEL);
if (!nfbdev)
@@ -386,7 +387,12 @@ int nouveau_fbcon_init(struct drm_device *dev)
dev_priv-nfbdev = nfbdev;
nfbdev-helper.funcs = nouveau_fbcon_helper_funcs;
 
-   drm_fb_helper_init(dev, nfbdev-helper, 2, 4);
+   ret = drm_fb_helper_init(dev, nfbdev-helper, 2, 4);
+   if (ret) {
+   kfree(nfbdev);
+   return ret;
+   }
+
drm_fb_helper_single_add_all_connectors(nfbdev-helper);
drm_fb_helper_initial_config(nfbdev-helper, 32);
return 0;
-- 
1.7.1

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