diff --git a/[refs] b/[refs]
index 31b008ef202c..2af9c43b5798 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6068764573d2f29529c8835126dabe3f2096c1f
+refs/heads/master: 4df6e868d475a884d672791c9091150c57094c95
diff --git a/trunk/drivers/media/platform/soc_camera/mx2_camera.c b/trunk/drivers/media/platform/soc_camera/mx2_camera.c
index 256187f30a6c..7c67fbc6c0cf 100644
--- a/trunk/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/trunk/drivers/media/platform/soc_camera/mx2_camera.c
@@ -469,11 +469,9 @@ static int mx2_camera_add_device(struct soc_camera_device *icd)
 
 	csicr1 = CSICR1_MCLKEN;
 
-	if (cpu_is_mx27()) {
+	if (cpu_is_mx27())
 		csicr1 |= CSICR1_PRP_IF_EN | CSICR1_FCC |
 			CSICR1_RXFF_LEVEL(0);
-	} else if (cpu_is_mx27())
-		csicr1 |= CSICR1_SOF_INTEN | CSICR1_RXFF_LEVEL(2);
 
 	pcdev->csicr1 = csicr1;
 	writel(pcdev->csicr1, pcdev->base_csi + CSICR1);