diff --git a/[refs] b/[refs]
index 7c1a7282fb50..c3d59ce698d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48a3c77338d725d4976fa792d822eb940ce5c296
+refs/heads/master: 5bccd60852fc0a5ccc1980c10266896df99b8bda
diff --git a/trunk/drivers/media/video/omap1_camera.c b/trunk/drivers/media/video/omap1_camera.c
index 0a2fb2bfdbfb..9ed1513122c1 100644
--- a/trunk/drivers/media/video/omap1_camera.c
+++ b/trunk/drivers/media/video/omap1_camera.c
@@ -1664,10 +1664,10 @@ static int __exit omap1_cam_remove(struct platform_device *pdev)
 	res = pcdev->res;
 	release_mem_region(res->start, resource_size(res));
 
-	kfree(pcdev);
-
 	clk_put(pcdev->clk);
 
+	kfree(pcdev);
+
 	dev_info(&pdev->dev, "OMAP1 Camera Interface driver unloaded\n");
 
 	return 0;