projects/linux·commit 1c65ae63

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

1c65ae63 · Linus Torvalds <[email protected]> · 2015-07-03 12:11:17 -07:00

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
Commit
1c65ae63c061c8eb22c780d99ebcd4492743c04e
Parents
b53343fc · 0438ec90

Merge commit. Changes below are compared with the first parent: b53343fc.

Changes

1 files changed · +9 −0

FileStatusAddDelContent
drivers/video/fbdev/omap2/dss/dss.cmodified+9−0View file

drivers/video/fbdev/omap2/dss/dss.c

View file
diff --git a/drivers/video/fbdev/omap2/dss/dss.c b/drivers/video/fbdev/omap2/dss/dss.c
index 612b093..9200a86 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;