---

yaml --- r: 92412 b: refs/heads/master c: c450e50 h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · dd0e4c9 · dd0e4c9
1 parent 03400d7
commit dd0e4c9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 39 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc36a686a65dd9b941463ff894a3868c62851186
+refs/heads/master: c450e50e8d6a0876431a744f1df9fdd5c2732b07
diff --git a/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c
@@ -2062,34 +2062,22 @@ static int cx88_xc3028_geniatech_tuner_callback(void *priv, int command, int mod
 	case XC2028_TUNER_RESET:
 		switch (INPUT(core->input).type) {
 		case CX88_RADIO:
-			cx_write(MO_GP1_IO, 0x101010);
-			mdelay(50);
-			cx_write(MO_GP1_IO, 0x101000);
-			mdelay(50);
-			cx_write(MO_GP1_IO, 0x101010);
-			mdelay(50);
-			return 0;
+			break;
 		case CX88_VMUX_DVB:
 			cx_write(MO_GP1_IO, 0x030302);
 			mdelay(50);
-			cx_write(MO_GP1_IO, 0x101010);
-			mdelay(50);
-			cx_write(MO_GP1_IO, 0x101000);
-			mdelay(50);
-			cx_write(MO_GP1_IO, 0x101010);
-			mdelay(50);
-			return 0;
+			break;
 		default:
 			cx_write(MO_GP1_IO, 0x030301);
 			mdelay(50);
-			cx_write(MO_GP1_IO, 0x101010);
-			mdelay(50);
-			cx_write(MO_GP1_IO, 0x101000);
-			mdelay(50);
-			cx_write(MO_GP1_IO, 0x101010);
-			mdelay(50);
-			return 0;
-		 }
+		}
+		cx_write(MO_GP1_IO, 0x101010);
+		mdelay(50);
+		cx_write(MO_GP1_IO, 0x101000);
+		mdelay(50);
+		cx_write(MO_GP1_IO, 0x101010);
+		mdelay(50);
+		return 0;
 	}
 	return -EINVAL;
 }
@@ -2145,33 +2133,26 @@ static int cx88_xc2028_tuner_callback(void *priv, int command, int arg)
 
 	switch (command) {
 	case XC2028_TUNER_RESET:
-	{
 		switch (INPUT(core->input).type) {
 		case CX88_RADIO:
 			printk(KERN_INFO "setting GPIO to radio!\n");
 			cx_write(MO_GP0_IO, 0x4ff);
 			mdelay(250);
 			cx_write(MO_GP2_IO, 0xff);
 			mdelay(250);
-			cx_write(MO_GP1_IO, 0x101010);
-			mdelay(250);
-			cx_write(MO_GP1_IO, 0x101000);
-			mdelay(250);
-			cx_write(MO_GP1_IO, 0x101010);
-			mdelay(250);
-			return 0;
+			break;
 		case CX88_VMUX_DVB:	/* Digital TV*/
 		default:		/* Analog TV */
 			printk(KERN_INFO "setting GPIO to TV!\n");
-			cx_write(MO_GP1_IO, 0x101010);
-			mdelay(250);
-			cx_write(MO_GP1_IO, 0x101000);
-			mdelay(250);
-			cx_write(MO_GP1_IO, 0x101010);
-			mdelay(250);
-			return 0;
+			break;
 		}
-	}
+		cx_write(MO_GP1_IO, 0x101010);
+		mdelay(250);
+		cx_write(MO_GP1_IO, 0x101000);
+		mdelay(250);
+		cx_write(MO_GP1_IO, 0x101010);
+		mdelay(250);
+		return 0;
 	}
 	return -EINVAL;
 }