From e647914153187eb97a5b57d5481fa14ae01a66bb Mon Sep 17 00:00:00 2001
From: "Leonid V. Fedorenchik" <leonidsbox@gmail.com>
Date: Fri, 16 Sep 2011 14:15:13 +0800
Subject: [PATCH] --- yaml --- r: 268464 b: refs/heads/master c:
 e313e1f9832c442e7981e0f01b6778b1fa8f07f5 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/cx25821/cx25821-video.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 21f4d7312a46..7ecf57adcc64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 527db49d91763b5c0f8fe800c13f2f6a738b8249
+refs/heads/master: e313e1f9832c442e7981e0f01b6778b1fa8f07f5
diff --git a/trunk/drivers/staging/cx25821/cx25821-video.c b/trunk/drivers/staging/cx25821/cx25821-video.c
index 020db63838d7..c54d309e11af 100644
--- a/trunk/drivers/staging/cx25821/cx25821-video.c
+++ b/trunk/drivers/staging/cx25821/cx25821-video.c
@@ -98,9 +98,8 @@ struct cx25821_fmt *cx25821_format_by_fourcc(unsigned int fourcc)
 {
 	unsigned int i;
 
-	if (fourcc == V4L2_PIX_FMT_Y41P || fourcc == V4L2_PIX_FMT_YUV411P) {
+	if (fourcc == V4L2_PIX_FMT_Y41P || fourcc == V4L2_PIX_FMT_YUV411P)
 		return formats + 1;
-	}
 
 	for (i = 0; i < ARRAY_SIZE(formats); i++)
 		if (formats[i].fourcc == fourcc)
@@ -147,9 +146,8 @@ void cx25821_video_wakeup(struct cx25821_dev *dev, struct cx25821_dmaqueue *q,
 		/* count comes from the hw and it is 16bit wide --
 		 * this trick handles wrap-arounds correctly for
 		 * up to 32767 buffers in flight... */
-		if ((s16) (count - buf->count) < 0) {
+		if ((s16) (count - buf->count) < 0)
 			break;
-		}
 
 		do_gettimeofday(&buf->vb.ts);
 		buf->vb.state = VIDEOBUF_DONE;