[media] ak881x: simplify standard checks

Simplify confusing conditions. This also swaps the checks for NTSC and PAL:
to be consistent with other drivers check for NTSC first. So if the user
sets both NTSC and PAL bits, then NTSC wins.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/i2c/ak881x.c b/drivers/media/i2c/ak881x.c
index 29846245aa3bb6762f06087379d089ad779c5d98..d3b965ec3bbc5597245a9df0eb9d415bb376993e 100644 (file)
--- a/drivers/media/i2c/ak881x.c
+++ b/drivers/media/i2c/ak881x.c
@@ -156,12 +156,12 @@ static int ak881x_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
        } else if (std == V4L2_STD_PAL_60) {
                vp1 = 7;
                ak881x->lines = 480;
-       } else if (std && !(std & ~V4L2_STD_PAL)) {
-               vp1 = 0xf;
-               ak881x->lines = 576;
-       } else if (std && !(std & ~V4L2_STD_NTSC)) {
+       } else if (std & V4L2_STD_NTSC) {
                vp1 = 0;
                ak881x->lines = 480;
+       } else if (std & V4L2_STD_PAL) {
+               vp1 = 0xf;
+               ak881x->lines = 576;
        } else {
                /* No SECAM or PAL_N/Nc supported */
                return -EINVAL;