Commit 1c65ae63 authored by Linus Torvalds's avatar Linus Torvalds

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
parents b53343fc 0438ec90
...@@ -1225,6 +1225,15 @@ static int dss_add_child_component(struct device *dev, void *data) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment