From 3eb0032d93e9fa7d6ff704c7b7ab967a024dae9a Mon Sep 17 00:00:00 2001
From: "Leonid V. Fedorenchik" <leonidsbox@gmail.com>
Date: Fri, 16 Sep 2011 14:15:08 +0800
Subject: [PATCH] --- yaml --- r: 268459 b: refs/heads/master c:
 12fe746fa96db3c14879222e977191eab1be8629 h: refs/heads/master i:   268457:
 7202455d0cae9a60aa1ec3d3c4f3cc30f4020b0e   268455:
 283d8b1a0f8796da071f907caec1721980d55fe3 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/cx25821/cx25821-video.c | 35 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 55d48198e75e..01dd326a6e2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16a81efe8819af8d99d68185cca904e1d6d9d864
+refs/heads/master: 12fe746fa96db3c14879222e977191eab1be8629
diff --git a/trunk/drivers/staging/cx25821/cx25821-video.c b/trunk/drivers/staging/cx25821/cx25821-video.c
index fbdb79f0c758..2383feb97828 100644
--- a/trunk/drivers/staging/cx25821/cx25821-video.c
+++ b/trunk/drivers/staging/cx25821/cx25821-video.c
@@ -1844,28 +1844,27 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,
 	   && command != ENABLE_CIF_RESOLUTION && command != REG_READ
 	   && command != REG_WRITE && command != MEDUSA_READ
 	   && command != MEDUSA_WRITE) {
-	       return 0;
-       }
+		return 0;
+	}
 
-       switch (command) {
-       case SET_VIDEO_STD:
-	       dev->tvnorm =
-		   !strcmp(data_from_user->vid_stdname,
-			   "PAL") ? V4L2_STD_PAL_BG : V4L2_STD_NTSC_M;
-	       medusa_set_videostandard(dev);
-	       break;
+	switch (command) {
+	case SET_VIDEO_STD:
+		dev->tvnorm = !strcmp(data_from_user->vid_stdname, "PAL") ?
+					V4L2_STD_PAL_BG : V4L2_STD_NTSC_M;
+		medusa_set_videostandard(dev);
+		break;
 
-       case SET_PIXEL_FORMAT:
-	       selected_channel = data_from_user->decoder_select;
-	       pix_format = data_from_user->pixel_format;
+	case SET_PIXEL_FORMAT:
+		selected_channel = data_from_user->decoder_select;
+		pix_format = data_from_user->pixel_format;
 
-	       if (!(selected_channel <= 7 && selected_channel >= 0)) {
-		       selected_channel -= 4;
-		       selected_channel = selected_channel % 8;
-	       }
+		if (!(selected_channel <= 7 && selected_channel >= 0)) {
+			selected_channel -= 4;
+			selected_channel = selected_channel % 8;
+		}
 
-	       if (selected_channel >= 0)
-		       cx25821_set_pixel_format(dev, selected_channel,
+		if (selected_channel >= 0)
+			cx25821_set_pixel_format(dev, selected_channel,
 						pix_format);
 
 	       break;