From: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Date: Sat, 22 Oct 2011 04:43:53 +0000 (-0300)
Subject: [media] cx25821-video.c: Move operators
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd52b2cf9bd60b1887e2ade2a2e12f155240fa9d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

[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>
---

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 =