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

Commit 2f7590b2 authored Jan 05, 2017 by Bartlomiej Zolnierkiewicz

Merge tag 'fbdev-v4.10-rc2' of git://github.com/bzolnier/linux into fbdev-for-next

fbdev fixes for v4.10-rc2:

- bring fbdev subsystem back into Maintained mode
- add missing devm_ioremap() error checking to cobalt_lcdfb driver

parents 0c744ea4 4dcd19bf

MAINTAINERS

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5080,9 +5080,11 @@ F: drivers/net/wan/dlci.c
	F: drivers/net/wan/sdla.c		F: drivers/net/wan/sdla.c

	FRAMEBUFFER LAYER		FRAMEBUFFER LAYER
			M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
	L: linux-fbdev@vger.kernel.org		L: linux-fbdev@vger.kernel.org
			T: git git://github.com/bzolnier/linux.git
	Q: http://patchwork.kernel.org/project/linux-fbdev/list/		Q: http://patchwork.kernel.org/project/linux-fbdev/list/
	S: Orphan		S: Maintained
	F: Documentation/fb/		F: Documentation/fb/
	F: drivers/video/		F: drivers/video/
	F: include/video/		F: include/video/

drivers/video/fbdev/cobalt_lcdfb.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -308,6 +308,11 @@ static int cobalt_lcdfb_probe(struct platform_device *dev)
	info->screen_size = resource_size(res);		info->screen_size = resource_size(res);
	info->screen_base = devm_ioremap(&dev->dev, res->start,		info->screen_base = devm_ioremap(&dev->dev, res->start,
	info->screen_size);		info->screen_size);
			if (!info->screen_base) {
			framebuffer_release(info);
			return -ENOMEM;
			}

	info->fbops = &cobalt_lcd_fbops;		info->fbops = &cobalt_lcd_fbops;
	info->fix = cobalt_lcdfb_fix;		info->fix = cobalt_lcdfb_fix;
	info->fix.smem_start = res->start;		info->fix.smem_start = res->start;