diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-05-08 03:40:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:33 -0400 |
commit | 435d56fcd45cdf32bfb4db5d4e1efe17f3da95b2 (patch) | |
tree | 8186ab252714aa0be13570db773c73430c6ae35f /drivers/video/pm2fb.c | |
parent | 19c1a8b3122e7b2007cfd2836da2318816f324cc (diff) |
pm2fb: fix of jumps in pm2fb_probe
This patch fixes incorrect targets of jumps when an error occurs in the
pm2fb_probe.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/pm2fb.c')
-rw-r--r-- | drivers/video/pm2fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 7f4c753b1d89..1ac5264bb2c1 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c | |||
@@ -1335,10 +1335,10 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, | |||
1335 | info->var = pm2fb_var; | 1335 | info->var = pm2fb_var; |
1336 | 1336 | ||
1337 | if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) | 1337 | if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) |
1338 | goto err_exit_all; | 1338 | goto err_exit_both; |
1339 | 1339 | ||
1340 | if (register_framebuffer(info) < 0) | 1340 | if (register_framebuffer(info) < 0) |
1341 | goto err_exit_both; | 1341 | goto err_exit_all; |
1342 | 1342 | ||
1343 | printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n", | 1343 | printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n", |
1344 | info->node, info->fix.id, pm2fb_fix.smem_len / 1024); | 1344 | info->node, info->fix.id, pm2fb_fix.smem_len / 1024); |