summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid V. Fedorenchik <leonidsbox@gmail.com>2011-10-22 01:43:53 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-24 19:01:58 -0200
commitcd52b2cf9bd60b1887e2ade2a2e12f155240fa9d (patch)
tree19befe457c52b31228c1a9358fb770cfcb586951
parent4a33b6f8bdf3b5a17737f66eef79b595cf3541a3 (diff)
downloadblackbird-op-linux-cd52b2cf9bd60b1887e2ade2a2e12f155240fa9d.tar.gz
blackbird-op-linux-cd52b2cf9bd60b1887e2ade2a2e12f155240fa9d.zip
[media] cx25821-video.c: Move operators
Move operator in complex expression to the end of the line to preserve consistency. Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx25821/cx25821-video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx25821/cx25821-video.c b/drivers/media/video/cx25821/cx25821-video.c
index 278e06b457d6..4bd7d71dc17a 100644
--- a/drivers/media/video/cx25821/cx25821-video.c
+++ b/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 =
OpenPOWER on IntegriCloud