diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-02-20 02:58:43 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-02-20 02:58:43 +0200 |
| commit | 4c4400504f6ada0cfed682fbe7e6c65efbda3952 (patch) | |
| tree | 5452eb39c76081fc871abdf1a38ccf3668f5cb4f /drivers/media/i2c/ov2659.c | |
| parent | d2eaa59000c7717e68a75cf2c106f056d2bc30b4 (diff) | |
| parent | 18922936dc2817488ebba985c5aaf3498f2ef96d (diff) | |
Merge remote-tracking branch 'linuxtv/vsp1' into HEAD
Diffstat (limited to 'drivers/media/i2c/ov2659.c')
| -rw-r--r-- | drivers/media/i2c/ov2659.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c index 02b9a3440557..1f999e9c0118 100644 --- a/drivers/media/i2c/ov2659.c +++ b/drivers/media/i2c/ov2659.c @@ -1321,10 +1321,6 @@ static int ov2659_detect(struct v4l2_subdev *sd) } usleep_range(1000, 2000); - ret = ov2659_init(sd, 0); - if (ret < 0) - return ret; - /* Check sensor revision */ ret = ov2659_read(client, REG_SC_CHIP_ID_H, &pid); if (!ret) @@ -1338,8 +1334,10 @@ static int ov2659_detect(struct v4l2_subdev *sd) dev_err(&client->dev, "Sensor detection failed (%04X, %d)\n", id, ret); - else + else { dev_info(&client->dev, "Found OV%04X sensor\n", id); + ret = ov2659_init(sd, 0); + } } return ret; |