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

Commit 9f744519 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev fixes from Bartlomiej Zolnierkiewicz:

 - bring fbdev subsystem back into Maintained mode

 - add missing devm_ioremap() error checking to cobalt_lcdfb driver

* tag 'fbdev-v4.10-rc2' of git://github.com/bzolnier/linux:
  video: fbdev: cobalt_lcdfb: Handle return NULL error from devm_ioremap
  MAINTAINERS: add myself as maintainer of fbdev
parents 99b9be77 4dcd19bf

MAINTAINERS

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



FRAMEBUFFER LAYER

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	linux-fbdev@vger.kernel.org

T:	git git://github.com/bzolnier/linux.git

Q:	http://patchwork.kernel.org/project/linux-fbdev/list/

S:	Orphan

S:	Maintained

F:	Documentation/fb/

F:	drivers/video/

F:	include/video/

drivers/video/fbdev/cobalt_lcdfb.c

+5 −0
Original line number 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_base = devm_ioremap(&dev->dev, res->start,

					 info->screen_size);

	if (!info->screen_base) {

		framebuffer_release(info);

		return -ENOMEM;

	}



	info->fbops = &cobalt_lcd_fbops;

	info->fix = cobalt_lcdfb_fix;

	info->fix.smem_start = res->start;