]> git.karo-electronics.de Git - linux-beck.git/commitdiff
fbdev: geocode: remove unneeded NULL check
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Tue, 6 Jan 2015 12:45:02 +0000 (18:15 +0530)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 13 Jan 2015 11:29:22 +0000 (13:29 +0200)
the check for info is not required as we are checking it immediately
after gxfb_init_fbinfo() and lxfb_init_fbinfo() and returnig -ENOMEM
if it is NULL.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/fbdev/geode/gxfb_core.c
drivers/video/fbdev/geode/lxfb_core.c

index 1790f14bab15dca4eca1276bb0a579df55e2296c..124d7c7e2d1482c3a01b419c11afa7572f864479 100644 (file)
@@ -444,10 +444,8 @@ static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                pci_release_region(pdev, 1);
        }
 
-       if (info) {
-               fb_dealloc_cmap(&info->cmap);
-               framebuffer_release(info);
-       }
+       fb_dealloc_cmap(&info->cmap);
+       framebuffer_release(info);
        return ret;
 }
 
index 9e1d19d673a18e182e8ffb83db732549833b1d73..138da6cb6cbcd5efbb8d1668ab66b87abfd99de7 100644 (file)
@@ -577,10 +577,8 @@ err:
                pci_release_region(pdev, 3);
        }
 
-       if (info) {
-               fb_dealloc_cmap(&info->cmap);
-               framebuffer_release(info);
-       }
+       fb_dealloc_cmap(&info->cmap);
+       framebuffer_release(info);
 
        return ret;
 }