aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/mt9t031.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/mt9t031.c b/drivers/media/video/mt9t031.c
index 677be18df9b3..23f9ce9d67ef 100644
--- a/drivers/media/video/mt9t031.c
+++ b/drivers/media/video/mt9t031.c
@@ -144,8 +144,6 @@ static int mt9t031_init(struct soc_camera_device *icd)
144 int ret; 144 int ret;
145 145
146 /* Disable chip output, synchronous option update */ 146 /* Disable chip output, synchronous option update */
147 dev_dbg(icd->vdev->parent, "%s\n", __func__);
148
149 ret = reg_write(icd, MT9T031_RESET, 1); 147 ret = reg_write(icd, MT9T031_RESET, 1);
150 if (ret >= 0) 148 if (ret >= 0)
151 ret = reg_write(icd, MT9T031_RESET, 0); 149 ret = reg_write(icd, MT9T031_RESET, 0);
@@ -186,9 +184,9 @@ static int mt9t031_set_bus_param(struct soc_camera_device *icd,
186 return -EINVAL; 184 return -EINVAL;
187 185
188 if (flags & SOCAM_PCLK_SAMPLE_FALLING) 186 if (flags & SOCAM_PCLK_SAMPLE_FALLING)
189 reg_set(icd, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000);
190 else
191 reg_clear(icd, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000); 187 reg_clear(icd, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000);
188 else
189 reg_set(icd, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000);
192 190
193 return 0; 191 return 0;
194} 192}