mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'fbdev-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

Browse Source 
Pull fbdev fix from Tomi Valkeinen:
 "Fix display regression on TI AM4xxx boards"

* tag 'fbdev-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  OMAPDSS: fix probing if rfbi device is enabled
This commit is contained in:
Linus Torvalds
2015-07-03 12:11:17 -07:00
parent b53343fc6c 0438ec90b1
commit 1c65ae63c0
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/video/fbdev/omap2/dss/dss.c
View File

@@ -1225,6 +1225,15 @@ static int dss_add_child_component(struct device *dev, void *data)
{ {
struct component_match **match = data; struct component_match **match = data;
/*
* HACK
* We don't have a working driver for rfbi, so skip it here always.
* Otherwise dss will never get probed successfully, as it will wait
* for rfbi to get probed.
*/
if (strstr(dev_name(dev), "rfbi"))
return 0;
component_match_add(dev->parent, match, dss_component_compare, dev); component_match_add(dev->parent, match, dss_component_compare, dev);
return 0; return 0;