aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Andrén <erik.andren@gmail.com>2008-11-27 12:07:24 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:39:59 -0500
commit1d07b6f14e39eb613e42ff7fe7e352d6f67a65eb (patch)
treec20d71d7c0c37c86a937660f0f4b404bef5d049a
parent48223c88299a10a62ff5f5e40bd07670a21c3de9 (diff)
V4L/DVB (10030): m5602: Use read/modify/write when toggling vflip on the po1030
Signed-off-by: Erik Andrén <erik.andren@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/gspca/m5602/m5602_po1030.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.c b/drivers/media/video/gspca/m5602/m5602_po1030.c
index f9932a16fbd7..2e7fb91673cf 100644
--- a/drivers/media/video/gspca/m5602/m5602_po1030.c
+++ b/drivers/media/video/gspca/m5602/m5602_po1030.c
@@ -184,12 +184,16 @@ int po1030_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
184 int err; 184 int err;
185 185
186 PDEBUG(D_V4L2, "Set hflip %d", val); 186 PDEBUG(D_V4L2, "Set hflip %d", val);
187 err = m5602_read_sensor(sd, PO1030_REG_CONTROL2, &i2c_data, 1);
188 if (err < 0)
189 goto out;
187 190
188 i2c_data = (val & 0x01) << 7; 191 i2c_data = (0x7f & i2c_data) | ((val & 0x01) << 7);
189 192
190 err = m5602_write_sensor(sd, PO1030_REG_CONTROL2, 193 err = m5602_write_sensor(sd, PO1030_REG_CONTROL2,
191 &i2c_data, 1); 194 &i2c_data, 1);
192 195
196out:
193 return err; 197 return err;
194} 198}
195 199
@@ -216,12 +220,16 @@ int po1030_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
216 int err; 220 int err;
217 221
218 PDEBUG(D_V4L2, "Set vflip %d", val); 222 PDEBUG(D_V4L2, "Set vflip %d", val);
223 err = m5602_read_sensor(sd, PO1030_REG_CONTROL2, &i2c_data, 1);
224 if (err < 0)
225 goto out;
219 226
220 i2c_data = (val & 0x01) << 6; 227 i2c_data = (i2c_data & 0xbf) | ((val & 0x01) << 6);
221 228
222 err = m5602_write_sensor(sd, PO1030_REG_CONTROL2, 229 err = m5602_write_sensor(sd, PO1030_REG_CONTROL2,
223 &i2c_data, 1); 230 &i2c_data, 1);
224 231
232out:
225 return err; 233 return err;
226} 234}
227 235