diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-01-06 18:15:02 +0530 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-01-13 13:29:22 +0200 |
| commit | 9cb13ba4355936b9c4f8eb3792bff6654e33ed5e (patch) | |
| tree | e4ec3bf1319429029ea0104f33ac931389c19d42 /drivers/video/fbdev/geode | |
| parent | 96699b4004f40cc0006794ff0f63ba841a4427fe (diff) | |
| download | linux-9cb13ba4355936b9c4f8eb3792bff6654e33ed5e.tar.bz2 | |
fbdev: geocode: remove unneeded NULL check
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>
Diffstat (limited to 'drivers/video/fbdev/geode')
| -rw-r--r-- | drivers/video/fbdev/geode/gxfb_core.c | 6 | ||||
| -rw-r--r-- | drivers/video/fbdev/geode/lxfb_core.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/video/fbdev/geode/gxfb_core.c b/drivers/video/fbdev/geode/gxfb_core.c index 1790f14bab15..124d7c7e2d14 100644 --- a/drivers/video/fbdev/geode/gxfb_core.c +++ b/drivers/video/fbdev/geode/gxfb_core.c @@ -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; } diff --git a/drivers/video/fbdev/geode/lxfb_core.c b/drivers/video/fbdev/geode/lxfb_core.c index 9e1d19d673a1..138da6cb6cbc 100644 --- a/drivers/video/fbdev/geode/lxfb_core.c +++ b/drivers/video/fbdev/geode/lxfb_core.c @@ -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; } |