2 files changed, 7 insertions, 0 deletions

diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
index 8f0100f67a9..29991d1cf13 100644
--- a/drivers/media/video/tcm825x.c
+++ b/drivers/media/video/tcm825x.c
@@ -523,6 +523,9 @@ static int ioctl_g_ctrl(struct v4l2_int_device *s,
         if (val < 0)
                 return val;
 
+        if (vc->id == V4L2_CID_HFLIP || vc->id == V4L2_CID_VFLIP)
+                val ^= sensor->platform_data->is_upside_down();
+
         vc->value = val;
         return 0;
 }
@@ -556,6 +559,9 @@ static int ioctl_s_ctrl(struct v4l2_int_device *s,
         if (lvc == NULL)
                 return -EINVAL;
 
+        if (vc->id == V4L2_CID_HFLIP || vc->id == V4L2_CID_VFLIP)
+                val ^= sensor->platform_data->is_upside_down();
+
         val = val << lvc->start_bit;
         if (tcm825x_write_reg_mask(client, lvc->reg, val))
                 return -EIO;
diff --git a/drivers/media/video/tcm825x.h b/drivers/media/video/tcm825x.h
index 966765b66b3..770ebacfa34 100644
--- a/drivers/media/video/tcm825x.h
+++ b/drivers/media/video/tcm825x.h
@@ -182,6 +182,7 @@ struct tcm825x_platform_data {
         int (*needs_reset)(struct v4l2_int_device *s, void *buf,
                            struct v4l2_pix_format *fmt);
         int (*ifparm)(struct v4l2_ifparm *p);
+        int (*is_upside_down)(void);
 };
 
 /* Array of image sizes supported by TCM825X.  These must be ordered from