Message ID | 1345528711-27801-22-git-send-email-archit@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index d808ce2..d14ffc5 100644 --- a/drivers/video/omap2/dss/manager.c +++ b/drivers/video/omap2/dss/manager.c @@ -509,7 +509,7 @@ static struct kobj_type manager_ktype = { static inline struct omap_dss_device *dss_mgr_get_device(struct omap_overlay_manager *mgr) { - return mgr->device; + return mgr->output ? mgr->output->device : NULL; } static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
A manager is not connected to a device directly any more. It first connects to an output, and then to the display. Update the manager's get_device op to return the device via the connected output. Signed-off-by: Archit Taneja <archit@ti.com> --- drivers/video/omap2/dss/manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)