---

yaml --- r: 76597 b: refs/heads/master c: d8f6997 h: refs/heads/master i: 76595: bdbbe79 v: v3
git-mirror · Jan 25, 2008 · 677724a · 677724a
1 parent 00806ce
commit 677724a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36e05a44756efe562ad1f49ada9bd6a598242828
+refs/heads/master: d8f69971d8d6c137e42928492f8d469078113db9
diff --git a/trunk/drivers/media/video/cx88/cx88-blackbird.c b/trunk/drivers/media/video/cx88/cx88-blackbird.c
@@ -594,13 +594,11 @@ static int blackbird_start_codec(struct file *file, void *priv)
 	int lastchange = -1;
 	int lastval = 0;
 
-	for (i=0; (i < 10) && (i < (lastchange + 4)); i++)
-	{
+	for (i = 0; (i < 10) && (i < (lastchange + 4)); i++) {
 		reg = cx_read(AUD_STATUS);
 
-		dprintk(1,"AUD_STATUS:%dL: 0x%x\n", i, reg);
-		if ((reg & 0x0F) != lastval)
-		{
+		dprintk(1, "AUD_STATUS:%dL: 0x%x\n", i, reg);
+		if ((reg & 0x0F) != lastval) {
 			lastval = reg & 0x0F;
 			lastchange = i;
 		}
@@ -610,7 +608,7 @@ static int blackbird_start_codec(struct file *file, void *priv)
 	/* unmute audio source */
 	cx_clear(AUD_VOL_CTL, (1 << 6));
 
-	blackbird_api_cmd(dev, CX2341X_ENC_REFRESH_INPUT, 0,0);
+	blackbird_api_cmd(dev, CX2341X_ENC_REFRESH_INPUT, 0, 0);
 
 	/* initialize the video input */
 	blackbird_api_cmd(dev, CX2341X_ENC_INITIALIZE_INPUT, 0, 0);

diff --git a/trunk/drivers/media/video/cx88/cx88-video.c b/trunk/drivers/media/video/cx88/cx88-video.c
@@ -421,7 +421,7 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
 
 			route.input = INPUT(input).audioroute;
 			cx88_call_i2c_clients(core,
-				VIDIOC_INT_S_AUDIO_ROUTING,&route);
+				VIDIOC_INT_S_AUDIO_ROUTING, &route);
 
 		}