diff --git a/[refs] b/[refs]
index 109a9c932c9e..bdf1476eb7c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bc515ac6e60c6437422c98fb3be89b3b0802286
+refs/heads/master: e41a35cb4be81a56664c52c94ddbdb740dca4f63
diff --git a/trunk/drivers/media/platform/exynos4-is/media-dev.c b/trunk/drivers/media/platform/exynos4-is/media-dev.c
index 1dbd55422706..a371ee5e857a 100644
--- a/trunk/drivers/media/platform/exynos4-is/media-dev.c
+++ b/trunk/drivers/media/platform/exynos4-is/media-dev.c
@@ -823,6 +823,10 @@ static void fimc_md_unregister_entities(struct fimc_md *fmd)
 		fimc_md_unregister_sensor(fmd->sensor[i].subdev);
 		fmd->sensor[i].subdev = NULL;
 	}
+
+	if (fmd->fimc_is)
+		v4l2_device_unregister_subdev(&fmd->fimc_is->isp.subdev);
+
 	v4l2_info(&fmd->v4l2_dev, "Unregistered all entities\n");
 }