From 908fb9e0fe3311d6bb7595222cf00c5747e6c12a Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 27 Jan 2012 15:58:33 +0300
Subject: [PATCH] --- yaml --- r: 287313 b: refs/heads/master c:
 7bc1dc7174d06104fde069a3b5aef1c5b902a5c9 h: refs/heads/master i:   287311:
 41ebef45efdac681ffdd81b4b88f520760f66691 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/video/intelfb/intelfbdrv.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4f8822771327..c5f4c35cc5c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64a9de8f07bf9ca909561c50d9f9e63bb7221b91
+refs/heads/master: 7bc1dc7174d06104fde069a3b5aef1c5b902a5c9
diff --git a/trunk/drivers/video/intelfb/intelfbdrv.c b/trunk/drivers/video/intelfb/intelfbdrv.c
index 5ba399991050..a5947c94145f 100644
--- a/trunk/drivers/video/intelfb/intelfbdrv.c
+++ b/trunk/drivers/video/intelfb/intelfbdrv.c
@@ -529,7 +529,6 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
 	if (fb_alloc_cmap(&info->cmap, 256, 1) < 0) {
 		ERR_MSG("Could not allocate cmap for intelfb_info.\n");
 		goto err_out_cmap;
-		return -ENODEV;
 	}
 
 	dinfo = info->par;