diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 12:11:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 12:11:17 -0700 |
| commit | 1c65ae63c061c8eb22c780d99ebcd4492743c04e (patch) | |
| tree | f682e222a1dc842692a2ec94ffe380966fb90e12 | |
| parent | b53343fc6c6f30ff5c6391d6f56d531afc2f4f7a (diff) | |
| parent | 0438ec90b17963662ef619b71c77c5c135b07014 (diff) | |
| download | linux-1c65ae63c061c8eb22c780d99ebcd4492743c04e.tar.bz2 | |
Merge tag 'fbdev-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
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
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/dss.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dss.c b/drivers/video/fbdev/omap2/dss/dss.c index 612b093831d5..9200a8668b49 100644 --- a/drivers/video/fbdev/omap2/dss/dss.c +++ b/drivers/video/fbdev/omap2/dss/dss.c @@ -1225,6 +1225,15 @@ static int dss_add_child_component(struct device *dev, void *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); return 0; |