diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2008-04-28 02:14:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 08:58:35 -0700 |
| commit | 2ae09f0da1cd0c8c646edea2e68356e76789461c (patch) | |
| tree | 5354faf610b582010fbe508de810c7dff9e52622 | |
| parent | 416e74ea7813597b586eafc24f67779eeb86e12f (diff) | |
pm2fb: correct error values returned from probe function
Fix error values returned in some code branches in the pm2fb_probe() function.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/video/pm2fb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 30181b59382..82aa8242f44 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c @@ -1687,10 +1687,12 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, if (!err || err == 4) info->var = pm2fb_var; - if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) + retval = fb_alloc_cmap(&info->cmap, 256, 0); + if (retval < 0) goto err_exit_both; - if (register_framebuffer(info) < 0) + retval = register_framebuffer(info); + if (retval < 0) goto err_exit_all; printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n", |