summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/mt9m111.c
diff options
context:
space:
mode:
authorAntonio Ospite <ospite@studenti.unina.it>2009-02-23 12:13:24 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:42:53 -0300
commitafb13683e988707bb6120435926243954e283b3e (patch)
treee6f7a52377a2043ebd56a2994ed5f26a6b926d3a /drivers/media/video/mt9m111.c
parentf7f41483bec8e8ddf3a6bd905b549d0a8d488fdb (diff)
downloadblackbird-op-linux-afb13683e988707bb6120435926243954e283b3e.tar.gz
blackbird-op-linux-afb13683e988707bb6120435926243954e283b3e.zip
V4L/DVB (10676): mt9m111: Call icl->reset() on mt9m111_reset().
Call icl->reset() on mt9m111_reset(). Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/mt9m111.c')
-rw-r--r--drivers/media/video/mt9m111.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c
index 6c363af165b7..7e6be36f0855 100644
--- a/drivers/media/video/mt9m111.c
+++ b/drivers/media/video/mt9m111.c
@@ -393,6 +393,8 @@ static int mt9m111_disable(struct soc_camera_device *icd)
static int mt9m111_reset(struct soc_camera_device *icd)
{
+ struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+ struct soc_camera_link *icl = mt9m111->client->dev.platform_data;
int ret;
ret = reg_set(RESET, MT9M111_RESET_RESET_MODE);
@@ -401,6 +403,10 @@ static int mt9m111_reset(struct soc_camera_device *icd)
if (!ret)
ret = reg_clear(RESET, MT9M111_RESET_RESET_MODE
| MT9M111_RESET_RESET_SOC);
+
+ if (icl->reset)
+ icl->reset(&mt9m111->client->dev);
+
return ret;
}
OpenPOWER on IntegriCloud