From bbe64329aa2c08e577c7d1649093e11e1bc432e8 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Mon, 29 Jun 2009 18:03:34 +0200
Subject: [PATCH] --- yaml --- r: 154535 b: refs/heads/master c:
 9ea5ca75a2aebb7172094a7d77acf6ff7600cc56 h: refs/heads/master i:   154533:
 71b4ce2e89b6e145e3e359d0fa08add80dfb1cc6   154531:
 7cb1020e19b3390c3435ec916493ca2b45028359   154527:
 a745686d4ab206987383d0cdf292840b9322b41b v: v3

---
 [refs]                   |  2 +-
 trunk/sound/oss/mpu401.c | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 8f91145865ed..7fa9d886d944 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 580c9d373ce7ccfbc5227e985fca761f8f039af3
+refs/heads/master: 9ea5ca75a2aebb7172094a7d77acf6ff7600cc56
diff --git a/trunk/sound/oss/mpu401.c b/trunk/sound/oss/mpu401.c
index 6c0a770ed054..1b2316f35b1f 100644
--- a/trunk/sound/oss/mpu401.c
+++ b/trunk/sound/oss/mpu401.c
@@ -926,31 +926,21 @@ static struct midi_operations mpu401_midi_operations[MAX_MIDI_DEV];
 static void mpu401_chk_version(int n, struct mpu_config *devc)
 {
 	int tmp;
-	unsigned long flags;
 
 	devc->version = devc->revision = 0;
 
-	spin_lock_irqsave(&devc->lock,flags);
-	if ((tmp = mpu_cmd(n, 0xAC, 0)) < 0)
-	{
-		spin_unlock_irqrestore(&devc->lock,flags);
+	tmp = mpu_cmd(n, 0xAC, 0);
+	if (tmp < 0)
 		return;
-	}
 	if ((tmp & 0xf0) > 0x20)	/* Why it's larger than 2.x ??? */
-	{
-		spin_unlock_irqrestore(&devc->lock,flags);
 		return;
-	}
 	devc->version = tmp;
 
-	if ((tmp = mpu_cmd(n, 0xAD, 0)) < 0)
-	{
+	if ((tmp = mpu_cmd(n, 0xAD, 0)) < 0) {
 		devc->version = 0;
-		spin_unlock_irqrestore(&devc->lock,flags);
 		return;
 	}
 	devc->revision = tmp;
-	spin_unlock_irqrestore(&devc->lock,flags);
 }
 
 int attach_mpu401(struct address_info *hw_config, struct module *owner)