summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2011-07-08 17:50:48 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 17:55:54 -0300
commit221a8248b9ca62a7304115782dca46a3f014f454 (patch)
treeea8f502b56386ea083cd4dbe636c410437d0c7cc /drivers
parentc9fb8bfaf1df361e54e330956dd45e3bec72f60a (diff)
downloadop-kernel-dev-221a8248b9ca62a7304115782dca46a3f014f454.zip
op-kernel-dev-221a8248b9ca62a7304115782dca46a3f014f454.tar.gz
[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')
-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 8415915..d6b7645 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);
OpenPOWER on IntegriCloud