aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2012-09-03 07:44:09 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-09-26 07:58:38 -0400
commit0f0e4e3cd8030c3056e8f43196a112e887a545f9 (patch)
tree30e0c84c0a5632997a1285dd90778220931d9398 /drivers/video
parent80d81d64d6272a622ee6c9d0de871507daa52c89 (diff)
OMAPDSS: APPLY: Remove omap_dss_device references from dss_ovl_enable/disable
An overlay isn't allowed to be enabled/disabled if it isn't connected to an omap_dss_device. This requirement isn't needed any more. An overlay can be enabled/disabled as long as it has an output connected to it. The output may not be connected to a device, but we can be assured that the connected manager's output is in use by an output interface. Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/apply.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index 417b286132f5..4bd1c998e12d 100644
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -1464,7 +1464,7 @@ int dss_ovl_enable(struct omap_overlay *ovl)
1464 goto err1; 1464 goto err1;
1465 } 1465 }
1466 1466
1467 if (ovl->get_device(ovl) == NULL) { 1467 if (ovl->manager == NULL || ovl->manager->output == NULL) {
1468 r = -EINVAL; 1468 r = -EINVAL;
1469 goto err1; 1469 goto err1;
1470 } 1470 }
@@ -1514,7 +1514,7 @@ int dss_ovl_disable(struct omap_overlay *ovl)
1514 goto err; 1514 goto err;
1515 } 1515 }
1516 1516
1517 if (ovl->get_device(ovl) == NULL) { 1517 if (ovl->manager == NULL || ovl->manager->output == NULL) {
1518 r = -EINVAL; 1518 r = -EINVAL;
1519 goto err; 1519 goto err;
1520 } 1520 }