From 5deb34479f28e0cc88ae1f30657714086357f4fa Mon Sep 17 00:00:00 2001 From: "Leonid V. Fedorenchik" Date: Sat, 22 Oct 2011 01:43:53 -0300 Subject: [PATCH] --- yaml --- r: 285285 b: refs/heads/master c: cd52b2cf9bd60b1887e2ade2a2e12f155240fa9d h: refs/heads/master i: 285283: 633a176b96bacfcc8623c8a0099596646c25dab9 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx25821/cx25821-video.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index feda6e7e00cf..d06e91fc862e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a33b6f8bdf3b5a17737f66eef79b595cf3541a3 +refs/heads/master: cd52b2cf9bd60b1887e2ade2a2e12f155240fa9d diff --git a/trunk/drivers/media/video/cx25821/cx25821-video.c b/trunk/drivers/media/video/cx25821/cx25821-video.c index 278e06b457d6..4bd7d71dc17a 100644 --- a/trunk/drivers/media/video/cx25821/cx25821-video.c +++ b/trunk/drivers/media/video/cx25821/cx25821-video.c @@ -616,8 +616,8 @@ int cx25821_buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb, if (channel_opened >= 0 && channel_opened <= 7) { if (dev->channels[channel_opened] .use_cif_resolution) { - if (dev->tvnorm & V4L2_STD_PAL_BG - || dev->tvnorm & V4L2_STD_PAL_DK) + if (dev->tvnorm & V4L2_STD_PAL_BG || + dev->tvnorm & V4L2_STD_PAL_DK) bpl_local = 352 << 1; else bpl_local =