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

2 files changed, 8 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index cfff2c9e3d94..2775b14f861a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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/
diff --git a/drivers/video/fbdev/cobalt_lcdfb.c b/drivers/video/fbdev/cobalt_lcdfb.c
index 2d3b691f3fc4..038ac6934fe9 100644
--- a/drivers/video/fbdev/cobalt_lcdfb.c
+++ b/drivers/video/fbdev/cobalt_lcdfb.c
@@ -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;