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);