aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/i2c/soc_camera/mt9v022.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/i2c/soc_camera/mt9v022.c b/drivers/media/i2c/soc_camera/mt9v022.c
index 5bc5a9286fd5..84d204f82cb2 100644
--- a/drivers/media/i2c/soc_camera/mt9v022.c
+++ b/drivers/media/i2c/soc_camera/mt9v022.c
@@ -15,6 +15,7 @@
15#include <linux/log2.h> 15#include <linux/log2.h>
16#include <linux/module.h> 16#include <linux/module.h>
17 17
18#include <media/mt9v022.h>
18#include <media/soc_camera.h> 19#include <media/soc_camera.h>
19#include <media/soc_mediabus.h> 20#include <media/soc_mediabus.h>
20#include <media/v4l2-subdev.h> 21#include <media/v4l2-subdev.h>
@@ -869,6 +870,7 @@ static int mt9v022_probe(struct i2c_client *client,
869 struct mt9v022 *mt9v022; 870 struct mt9v022 *mt9v022;
870 struct soc_camera_link *icl = soc_camera_i2c_to_link(client); 871 struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
871 struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); 872 struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
873 struct mt9v022_platform_data *pdata = icl->priv;
872 int ret; 874 int ret;
873 875
874 if (!icl) { 876 if (!icl) {
@@ -932,10 +934,10 @@ static int mt9v022_probe(struct i2c_client *client,
932 mt9v022->chip_control = MT9V022_CHIP_CONTROL_DEFAULT; 934 mt9v022->chip_control = MT9V022_CHIP_CONTROL_DEFAULT;
933 935
934 /* 936 /*
935 * MT9V022 _really_ corrupts the first read out line. 937 * On some platforms the first read out line is corrupted.
936 * TODO: verify on i.MX31 938 * Workaround it by skipping if indicated by platform data.
937 */ 939 */
938 mt9v022->y_skip_top = 1; 940 mt9v022->y_skip_top = pdata ? pdata->y_skip_top : 0;
939 mt9v022->rect.left = MT9V022_COLUMN_SKIP; 941 mt9v022->rect.left = MT9V022_COLUMN_SKIP;
940 mt9v022->rect.top = MT9V022_ROW_SKIP; 942 mt9v022->rect.top = MT9V022_ROW_SKIP;
941 mt9v022->rect.width = MT9V022_MAX_WIDTH; 943 mt9v022->rect.width = MT9V022_MAX_WIDTH;