projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4a33b6f)
[media] cx25821-video.c: Move operators
authorLeonid V. Fedorenchik <leonidsbox@gmail.com>
Sat, 22 Oct 2011 04:43:53 +0000 (01:43 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 24 Nov 2011 21:01:58 +0000 (19:01 -0200)
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>
drivers/media/video/cx25821/cx25821-video.c patch | blob | blame | history

diff --git a/drivers/media/video/cx25821/cx25821-video.c b/drivers/media/video/cx25821/cx25821-video.c
index 278e06b457d6f82a3c4a4d253108fcb0df9bc148..4bd7d71dc17a8ce14defc33ee0193a8d32c0986f 100644 (file)
--- 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 =