Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 435d56fc authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

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: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 19c1a8b3

drivers/video/pm2fb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1335,10 +1335,10 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, 
		info->var = pm2fb_var;

		info->var = pm2fb_var;





	if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)

	if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)

		goto err_exit_all;

		goto err_exit_both;





	if (register_framebuffer(info) < 0)

	if (register_framebuffer(info) < 0)

		goto err_exit_both;

		goto err_exit_all;





	printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n",

	printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n",

	       info->node, info->fix.id, pm2fb_fix.smem_len / 1024);

	       info->node, info->fix.id, pm2fb_fix.smem_len / 1024);