---

yaml --- r: 199935 b: refs/heads/master c: 51ff9ef h: refs/heads/master i: 199933: e796b7f 199931: 7e7d3de 199927: bce85fc 199919: f10420e 199903: 40f958f 199871: 44b63ba 199807: 9646fd7 199679: 813dfd2 v: v3
git-mirror · Jun 1, 2010 · 69a1d15 · 69a1d15
1 parent 3cfe669
commit 69a1d15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 478b3a42bdcd8d1cb57c91cabdc8b6164c639e42
+refs/heads/master: 51ff9ef13366b3752a8ab6229c466fd1bd671d3a
diff --git a/trunk/drivers/media/dvb/ngene/ngene-core.c b/trunk/drivers/media/dvb/ngene/ngene-core.c
@@ -570,11 +570,7 @@ static int ngene_command_stream_control(struct ngene *dev, u8 stream,
 	u16 BsSPI = ((stream & 1) ? 0x9800 : 0x9700);
 	u16 BsSDO = 0x9B00;
 
-	/* down(&dev->stream_mutex); */
-	while (down_trylock(&dev->stream_mutex)) {
-		printk(KERN_INFO DEVICE_NAME ": SC locked\n");
-		msleep(1);
-	}
+	down(&dev->stream_mutex);
 	memset(&com, 0, sizeof(com));
 	com.cmd.hdr.Opcode = CMD_CONTROL;
 	com.cmd.hdr.Length = sizeof(struct FW_STREAM_CONTROL) - 2;