leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fbdev fixes for v4.10-rc2:

Browse Source 
- bring fbdev subsystem back into Maintained mode
 - add missing devm_ioremap() error checking to cobalt_lcdfb driver
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJYbOonAAoJEH4ztj+gR8IL2u4P/1jQUhkSd8Fm124VsVZVkzHR
 Qjr+l7iXkF8I9MsHF5m9UVLO7bhuRsOtLbp1zeDf6OswidMutAKSOvHJ8Qym2v/6
 fwgCOVLABjdIJaoFXcOD/6Hh05UIr64bS6WGK/UaNkQakaTbqyv/Dmn8nFllxodo
 pWDoeqFGiL3uVFi8mCDBV2yDBgWmPOPbFVGIosbWbIsgGVnYYaYXIJNfwEBGBL4X
 4XpmrfhmFyf8RCpKsSzuKNUd+AHIFqJoWLtukQQIe6hnO+E0u18wBx/f1bM7OGIF
 NPZ1ZklH5IILCuSBChznArKhmN6nQWTZ1+JOrQNOfRDX8r5nn50dMYQ2+oNYoBRd
 zt0wzK0L5kB6xeVOXjUjhy+zlAc96os7lZ2f54QUyMflkpTCJgnqxARpBtwlfKle
 dL5RW5g1SYBnwTc8XeHKPIZt95Oxa3aZ5du+gHulLNu4Oh+sTK8yfwV8kboHC0xQ
 w7zU1wgncrynUvB5ef2SXXPpPr3jWWXYjeCPQJ1Ife1rrYnjNn/cPdAgFOn5KZYz
 n0TMKXbEGJFCXMnuBKj+9mKTR8KBOgm8VlrFmzkcHQYKPqMEERSwtqlJa3wo7s7n
 Ksf1WUD12JZN4UVBWcXCct0RfZfrpZObnHRcqg1/aOZo9ajfFo2YuEh3q4sKQYaS
 d5DihcH03h6mF5dvGuAr
 =v+HB
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2017-01-04 09:00:57 -08:00
commit 9f7445197a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -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/

5
drivers/video/fbdev/cobalt_lcdfb.c
View File

@ -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;