summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-02-23 16:13:24 +0100
committerGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-02-23 16:13:24 +0100
commita43bb4e65ce2015ec503f7933fbd136271d80c34 (patch)
treeba9ab1fc07a2f56babdd8a81a8b0c51f36c4dc06 /linux/drivers
parent4fac8946610c89188811e2f6936c4c8cc6fecaa0 (diff)
downloadmediapointer-dvb-s2-a43bb4e65ce2015ec503f7933fbd136271d80c34.tar.gz
mediapointer-dvb-s2-a43bb4e65ce2015ec503f7933fbd136271d80c34.tar.bz2
mt9m111: Call icl->reset() on mt9m111_reset().
From: Antonio Ospite <ospite@studenti.unina.it> 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> --- drivers/media/video/mt9m111.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/mt9m111.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/video/mt9m111.c b/linux/drivers/media/video/mt9m111.c
index b2989c0f2..3ae675a42 100644
--- a/linux/drivers/media/video/mt9m111.c
+++ b/linux/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;
}