diff options
author | Antonio Ospite <ospite@studenti.unina.it> | 2009-02-23 10:13:24 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:53 -0400 |
commit | afb13683e988707bb6120435926243954e283b3e (patch) | |
tree | e6f7a52377a2043ebd56a2994ed5f26a6b926d3a /drivers/media/video/mt9m111.c | |
parent | f7f41483bec8e8ddf3a6bd905b549d0a8d488fdb (diff) |
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.c | 6 |
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) | |||
393 | 393 | ||
394 | static int mt9m111_reset(struct soc_camera_device *icd) | 394 | static int mt9m111_reset(struct soc_camera_device *icd) |
395 | { | 395 | { |
396 | struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd); | ||
397 | struct soc_camera_link *icl = mt9m111->client->dev.platform_data; | ||
396 | int ret; | 398 | int ret; |
397 | 399 | ||
398 | ret = reg_set(RESET, MT9M111_RESET_RESET_MODE); | 400 | ret = reg_set(RESET, MT9M111_RESET_RESET_MODE); |
@@ -401,6 +403,10 @@ static int mt9m111_reset(struct soc_camera_device *icd) | |||
401 | if (!ret) | 403 | if (!ret) |
402 | ret = reg_clear(RESET, MT9M111_RESET_RESET_MODE | 404 | ret = reg_clear(RESET, MT9M111_RESET_RESET_MODE |
403 | | MT9M111_RESET_RESET_SOC); | 405 | | MT9M111_RESET_RESET_SOC); |
406 | |||
407 | if (icl->reset) | ||
408 | icl->reset(&mt9m111->client->dev); | ||
409 | |||
404 | return ret; | 410 | return ret; |
405 | } | 411 | } |
406 | 412 | ||