From fb6812f03e4c821fd751753c3c955d6960a44402 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 23 Feb 2009 12:13:24 -0300 Subject: [PATCH] --- yaml --- r: 137947 b: refs/heads/master c: afb13683e988707bb6120435926243954e283b3e h: refs/heads/master i: 137945: 4ca7bb3b5c99fcb278873c48c4ed164e4d7b330f 137943: 1766d7a81b224e212aff3e5a7e9bc6a809c3a7f7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mt9m111.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b9c1f943ada9..a832667f02e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7f41483bec8e8ddf3a6bd905b549d0a8d488fdb +refs/heads/master: afb13683e988707bb6120435926243954e283b3e diff --git a/trunk/drivers/media/video/mt9m111.c b/trunk/drivers/media/video/mt9m111.c index 6c363af165b7..7e6be36f0855 100644 --- a/trunk/drivers/media/video/mt9m111.c +++ b/trunk/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; }