1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/video/omap2/dss/output.c b/drivers/video/omap2/dss/output.c
index 15f47af8e048..2ab3afa615e8 100644
--- a/drivers/video/omap2/dss/output.c
+++ b/drivers/video/omap2/dss/output.c
@@ -34,9 +34,9 @@ int omapdss_output_set_device(struct omap_dss_device *out,
 
         mutex_lock(&output_lock);
 
-        if (out->device) {
+        if (out->dst) {
                 DSSERR("output already has device %s connected to it\n",
-                        out->device->name);
+                        out->dst->name);
                 r = -EINVAL;
                 goto err;
         }
@@ -47,7 +47,7 @@ int omapdss_output_set_device(struct omap_dss_device *out,
                 goto err;
         }
 
-        out->device = dssdev;
+        out->dst = dssdev;
         dssdev->src = out;
 
         mutex_unlock(&output_lock);
@@ -66,21 +66,21 @@ int omapdss_output_unset_device(struct omap_dss_device *out)
 
         mutex_lock(&output_lock);
 
-        if (!out->device) {
+        if (!out->dst) {
                 DSSERR("output doesn't have a device connected to it\n");
                 r = -EINVAL;
                 goto err;
         }
 
-        if (out->device->state != OMAP_DSS_DISPLAY_DISABLED) {
+        if (out->dst->state != OMAP_DSS_DISPLAY_DISABLED) {
                 DSSERR("device %s is not disabled, cannot unset device\n",
-                                out->device->name);
+                                out->dst->name);
                 r = -EINVAL;
                 goto err;
         }
 
-        out->device->src = NULL;
-        out->device = NULL;
+        out->dst->src = NULL;
+        out->dst = NULL;
 
         mutex_unlock(&output_lock);