diff --git a/[refs] b/[refs]
index c92ec41d3082..f0f3e8f10192 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dcc731a93679d75a1f90a969b34aa9d7acd1cbf
+refs/heads/master: fff96b6685d6fec14deaacbce9e27fbb8feed53d
diff --git a/trunk/drivers/media/video/soc_camera_platform.c b/trunk/drivers/media/video/soc_camera_platform.c
index f5ebe59a5555..c8f6b188496d 100644
--- a/trunk/drivers/media/video/soc_camera_platform.c
+++ b/trunk/drivers/media/video/soc_camera_platform.c
@@ -173,7 +173,9 @@ static int soc_camera_platform_probe(struct platform_device *pdev)
 static int soc_camera_platform_remove(struct platform_device *pdev)
 {
 	struct soc_camera_platform_priv *priv = get_priv(pdev);
+	struct soc_camera_platform_info *p = v4l2_get_subdevdata(&priv->subdev);
 
+	p->icd->control = NULL;
 	v4l2_device_unregister_subdev(&priv->subdev);
 	platform_set_drvdata(pdev, NULL);
 	kfree(priv);