aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2016-03-15 14:55:53 +0200
committerDave Airlie <airlied@redhat.com>2016-03-16 11:08:35 +1000
commit55f6fca3be37539fbb0a455deae400e04b968cdd (patch)
tree7ad7cfceb2b50393731af7cd9cce8e4b67d5722b /drivers
parentMerge tag 'drm-vc4-next-2016-03-14' of github.com:anholt/linux into drm-next (diff)
downloadlinux-dev-55f6fca3be37539fbb0a455deae400e04b968cdd.tar.xz
linux-dev-55f6fca3be37539fbb0a455deae400e04b968cdd.zip
drm/omap: fix panel/encoder probes
The recent changes which removed platform data support from panels & encoders had a few mistakes, causing probes of DVI connector and DSI command mode panels to fail every time due to missing '!'. Fix the if()s. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/omapdrm/displays/connector-dvi.c2
-rw-r--r--drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
index 3fd5a0b4d4cf..747f26a55e43 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
@@ -279,7 +279,7 @@ static int dvic_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ddata);
- if (pdev->dev.of_node)
+ if (!pdev->dev.of_node)
return -ENODEV;
r = dvic_probe_of(pdev);
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index ae7dd625e19f..36485c2137ce 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -1180,7 +1180,7 @@ static int dsicm_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ddata);
ddata->pdev = pdev;
- if (pdev->dev.of_node)
+ if (!pdev->dev.of_node)
return -ENODEV;
r = dsicm_probe_of(pdev);