1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/video/omap2/dss/manager-sysfs.c b/drivers/video/omap2/dss/manager-sysfs.c
index 9b875fbe757e..55cf955f663d 100644
--- a/drivers/video/omap2/dss/manager-sysfs.c
+++ b/drivers/video/omap2/dss/manager-sysfs.c
@@ -38,8 +38,10 @@ static ssize_t manager_name_show(struct omap_overlay_manager *mgr, char *buf)
 
 static ssize_t manager_display_show(struct omap_overlay_manager *mgr, char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%s\n",
-                        mgr->device ? mgr->device->name : "<none>");
+        struct omap_dss_device *dssdev = mgr->get_device(mgr);
+
+        return snprintf(buf, PAGE_SIZE, "%s\n", dssdev ?
+                        dssdev->name : "<none>");
 }
 
 static ssize_t manager_display_store(struct omap_overlay_manager *mgr,
@@ -67,7 +69,7 @@ static ssize_t manager_display_store(struct omap_overlay_manager *mgr,
         if (dssdev)
                 DSSDBG("display %s found\n", dssdev->name);
 
-        if (mgr->device) {
+        if (mgr->get_device(mgr)) {
                 r = mgr->unset_device(mgr);
                 if (r) {
                         DSSERR("failed to unset display\n");