From e2b7616e9d5f6e8756157c6de0e1281e5c87d483 Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 8 Jul 2011 17:50:48 -0300
Subject: [PATCH] --- yaml --- r: 261532 b: refs/heads/master c:
 221a8248b9ca62a7304115782dca46a3f014f454 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/media/video/marvell-ccic/mmp-driver.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ffd2fc60490b..4041acffb6ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9fb8bfaf1df361e54e330956dd45e3bec72f60a
+refs/heads/master: 221a8248b9ca62a7304115782dca46a3f014f454
diff --git a/trunk/drivers/media/video/marvell-ccic/mmp-driver.c b/trunk/drivers/media/video/marvell-ccic/mmp-driver.c
index 841591556994..d6b764541375 100644
--- a/trunk/drivers/media/video/marvell-ccic/mmp-driver.c
+++ b/trunk/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);