diff options
| author | Archit Taneja <archit@ti.com> | 2012-09-03 13:44:09 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-26 13:58:38 +0200 |
| commit | 0f0e4e3cd8030c3056e8f43196a112e887a545f9 (patch) | |
| tree | 30e0c84c0a5632997a1285dd90778220931d9398 /drivers/video | |
| parent | OMAPDSS: OVERLAY/MANAGER: Get device via output (diff) | |
| download | linux-0f0e4e3cd8030c3056e8f43196a112e887a545f9.tar.xz linux-0f0e4e3cd8030c3056e8f43196a112e887a545f9.zip | |
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.c | 4 |
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) goto err1; } - if (ovl->get_device(ovl) == NULL) { + if (ovl->manager == NULL || ovl->manager->output == NULL) { r = -EINVAL; goto err1; } @@ -1514,7 +1514,7 @@ int dss_ovl_disable(struct omap_overlay *ovl) goto err; } - if (ovl->get_device(ovl) == NULL) { + if (ovl->manager == NULL || ovl->manager->output == NULL) { r = -EINVAL; goto err; } |