From 80d81d64d6272a622ee6c9d0de871507daa52c89 Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Tue, 5 Jun 2012 18:33:28 +0530 Subject: OMAPDSS: OVERLAY/MANAGER: Get device via output A manager is not connected to a device directly any more. It first connects to an output, and then to the display. Update overlay and manager get_device ops to return the device via the connected output. Signed-off-by: Archit Taneja --- drivers/video/omap2/dss/overlay.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/video/omap2/dss/overlay.c') diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c index 0f799e2d91b..45f4994bc6b 100644 --- a/drivers/video/omap2/dss/overlay.c +++ b/drivers/video/omap2/dss/overlay.c @@ -40,7 +40,9 @@ static struct omap_overlay *overlays; static inline struct omap_dss_device *dss_ovl_get_device(struct omap_overlay *ovl) { - return ovl->manager ? ovl->manager->device : NULL; + return ovl->manager ? + (ovl->manager->output ? ovl->manager->output->device : NULL) : + NULL; } int omap_dss_get_num_overlays(void) -- cgit v1.2.3-70-g09d2