---

yaml --- r: 330903 b: refs/heads/master c: c4ede4c h: refs/heads/master i: 330901: 9846b10 330899: 881d3e0 330895: 0ec0753 v: v3
git-mirror · Aug 15, 2012 · cd1d85f · cd1d85f
1 parent 83ffb64
commit cd1d85f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c078ac18f3f94f643ab477949d0cd93667904e06
+refs/heads/master: c4ede4cedad1163345a2c2b4abc7e2208034190e
diff --git a/trunk/drivers/media/platform/mx3_camera.c b/trunk/drivers/media/platform/mx3_camera.c
@@ -1171,9 +1171,7 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev)
 
 	mx3_cam->pdata = pdev->dev.platform_data;
 	mx3_cam->platform_flags = mx3_cam->pdata->flags;
-	if (!(mx3_cam->platform_flags & (MX3_CAMERA_DATAWIDTH_4 |
-			MX3_CAMERA_DATAWIDTH_8 | MX3_CAMERA_DATAWIDTH_10 |
-			MX3_CAMERA_DATAWIDTH_15))) {
+	if (!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_MASK)) {
 		/*
 		 * Platform hasn't set available data widths. This is bad.
 		 * Warn and use a default.