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

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
...@@ -5080,9 +5080,11 @@ F: drivers/net/wan/dlci.c ...@@ -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/
......
...@@ -308,6 +308,11 @@ static int cobalt_lcdfb_probe(struct platform_device *dev) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment