From 69a1d15a172234347c18dd1d2bdad59ce4a760d6 Mon Sep 17 00:00:00 2001
From: Oliver Endriss <o.endriss@gmx.de>
Date: Wed, 19 May 2010 04:17:18 -0300
Subject: [PATCH] --- yaml --- r: 199935 b: refs/heads/master c:
 51ff9ef13366b3752a8ab6229c466fd1bd671d3a h: refs/heads/master i:   199933:
 e796b7f86114a4a7a0b83f931f87380bbfe57e66   199931:
 7e7d3de8850ae477ec192e3eda8ec84cec36e1c6   199927:
 bce85fcedf67c94ccb7bfd77e4c2851b0ff60deb   199919:
 f10420ee1df8a436bb4782df21ac9ef8ec3a1bb1   199903:
 40f958f28bf3d3e82f7ed05860432305b37c4487   199871:
 44b63ba91f6e63e37c57d6f404823cee49e17dc9   199807:
 9646fd7a5f590fc9f4ac1b7253520636bc9c62cf   199679:
 813dfd27e1233fdb236c6ea57ba88f738697492f v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/dvb/ngene/ngene-core.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d72cdb5327b8..ae5f447f31fd 100644
--- 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
index dcf1f45ff07c..4caeb163a666 100644
--- 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;