From cd1d85fa9099d1a8977c6657535d8da0f173c52c Mon Sep 17 00:00:00 2001 From: Liu Ying Date: Mon, 6 Aug 2012 03:02:08 -0300 Subject: [PATCH] --- yaml --- r: 330903 b: refs/heads/master c: c4ede4cedad1163345a2c2b4abc7e2208034190e h: refs/heads/master i: 330901: 9846b1046d574d3e744ad61a7d2bc4158c384d78 330899: 881d3e0e070b956be9260ec61bbe0d3c71a90ffa 330895: 0ec0753249479386a262120f664fb9b4173d330f v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/mx3_camera.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7ca6886fab6f..cff7cf76d1e0 100644 --- 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 index af2297dd49c8..16975c6e6905 100644 --- 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.