From b0fc745a6a4d9035d4c5286e9646727d21389bb4 Mon Sep 17 00:00:00 2001
From: Lei Wen <leiwen@marvell.com>
Date: Tue, 22 Nov 2011 11:04:29 -0300
Subject: [PATCH] --- yaml --- r: 285712 b: refs/heads/master c:
 48ecf9fe8fbe7869dcbaeb636a8f9cfa937876aa h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 97c801296b6d..af0e9a4eb33d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da673e603bb78ea26beaef5720017827aa26dae3
+refs/heads/master: 48ecf9fe8fbe7869dcbaeb636a8f9cfa937876aa
diff --git a/trunk/drivers/media/video/soc_camera.c b/trunk/drivers/media/video/soc_camera.c
index a14df27d2552..b82710745ba8 100644
--- a/trunk/drivers/media/video/soc_camera.c
+++ b/trunk/drivers/media/video/soc_camera.c
@@ -600,9 +600,9 @@ static int soc_camera_close(struct file *file)
 		pm_runtime_suspend(&icd->vdev->dev);
 		pm_runtime_disable(&icd->vdev->dev);
 
-		ici->ops->remove(icd);
 		if (ici->ops->init_videobuf2)
 			vb2_queue_release(&icd->vb2_vidq);
+		ici->ops->remove(icd);
 
 		soc_camera_power_off(icd, icl);
 	}