aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2011-07-08 16:50:48 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:55:54 -0400
commit221a8248b9ca62a7304115782dca46a3f014f454 (patch)
treeea8f502b56386ea083cd4dbe636c410437d0c7cc /drivers/media/video
parentc9fb8bfaf1df361e54e330956dd45e3bec72f60a (diff)
[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>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/marvell-ccic/mmp-driver.c2
1 files changed, 1 insertions, 1 deletions
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)
267 267
268out_unregister: 268out_unregister:
269 mccic_shutdown(mcam); 269 mccic_shutdown(mcam);
270 mmpcam_power_down(mcam);
271out_gpio2: 270out_gpio2:
271 mmpcam_power_down(mcam);
272 gpio_free(pdata->sensor_reset_gpio); 272 gpio_free(pdata->sensor_reset_gpio);
273out_gpio: 273out_gpio:
274 gpio_free(pdata->sensor_power_gpio); 274 gpio_free(pdata->sensor_power_gpio);