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

Commit c2312427 authored by Andres Salomon's avatar Andres Salomon Committed by Linus Torvalds
Browse files

sstfb: check fb_alloc_cmap return value and handle failure properly 



Signed-off-by: default avatarAndres Salomon <dilinger@debian.org>
Acked-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0a5d924e

drivers/video/sstfb.c

+7 −3
Original line number Diff line number Diff line
@@ -1421,13 +1421,16 @@ static int __devinit sstfb_probe(struct pci_dev *pdev, 
		goto fail;

	}

	

	fb_alloc_cmap(&info->cmap, 256, 0);

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

		printk(KERN_ERR "sstfb: can't alloc cmap memory.\n");

		goto fail;

	}



	/* register fb */

	info->device = &pdev->dev;

	if (register_framebuffer(info) < 0) {

		printk(KERN_ERR "sstfb: can't register framebuffer.\n");

		goto fail;

		goto fail_register;

	}



	sstfb_clear_screen(info);
@@ -1441,8 +1444,9 @@ static int __devinit sstfb_probe(struct pci_dev *pdev, 


	return 0;



fail:

fail_register:

	fb_dealloc_cmap(&info->cmap);

fail:

	iounmap(info->screen_base);

fail_fb_remap:

	iounmap(par->mmio_vbase);