From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 8 Jul 2011 20:50:48 +0000 (-0300)
Subject: [media] marvell-cam: power down mmp camera on registration failure
X-Git-Tag: MMI-PSA29.97-13-9~18729^2~77
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=221a8248b9ca62a7304115782dca46a3f014f454;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[media] marvell-cam: power down mmp camera on registration failure

If registration does not work, we don't want to leave the sensor powered on.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/marvell-ccic/mmp-driver.c b/drivers/media/video/marvell-ccic/mmp-driver.c
index 841591556994..d6b764541375 100644
--- a/drivers/media/video/marvell-ccic/mmp-driver.c
+++ b/drivers/media/video/marvell-ccic/mmp-driver.c
@@ -267,8 +267,8 @@ static int mmpcam_probe(struct platform_device *pdev)
 
 out_unregister:
 	mccic_shutdown(mcam);
-	mmpcam_power_down(mcam);
 out_gpio2:
+	mmpcam_power_down(mcam);
 	gpio_free(pdata->sensor_reset_gpio);
 out_gpio:
 	gpio_free(pdata->sensor_power_gpio);