diff --git a/[refs] b/[refs]
index 2fdf14be8d25..94f347e16d9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b618b69c108b4fa792ff3dfe1ea95eeca7bc6af8
+refs/heads/master: 6ec5575c381de50b17e68796435f20ce1b27de79
diff --git a/trunk/drivers/media/platform/soc_camera/mx2_camera.c b/trunk/drivers/media/platform/soc_camera/mx2_camera.c
index 77529f860386..2c148028d8c0 100644
--- a/trunk/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/trunk/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1394,8 +1394,6 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd,
 		return -EINVAL;
 	}
 
-	/* FIXME: implement MX27 limits */
-
 	/* limit to MX25 hardware capabilities */
 	if (cpu_is_mx25()) {
 		if (xlate->host_fmt->bits_per_sample <= 8)
@@ -1427,6 +1425,12 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd,
 			pix->sizeimage = soc_mbus_image_size(xlate->host_fmt,
 						pix->bytesperline, pix->height);
 		}
+	} else {
+		/*
+		 * Width must be a multiple of 8 as requested by the CSI.
+		 * (Table 39-2 in the i.MX27 Reference Manual).
+		 */
+		pix->width &= ~0x7;
 	}
 
 	/* limit to sensor capabilities */