From 0074570686260b21c22b87f09b8dccee611cb573 Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb@bu3sch.de>
Date: Fri, 11 Sep 2009 18:31:32 +0200
Subject: [PATCH] --- yaml --- r: 166259 b: refs/heads/master c:
 91d372c0afc55faf44c1b763693f089b5dad31ec h: refs/heads/master i:   166257:
 59c3b70fac42d909b782bb5cf5fecdfcd85ba56d   166255:
 8d9e2a047562a97cb5255136505c9bdaa9e1de03 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/wireless/b43/main.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index cf50fd338edd..3810b8a8c60d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44fdd375cd8bb3544f9832b4a42df497d180feb2
+refs/heads/master: 91d372c0afc55faf44c1b763693f089b5dad31ec
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index 78e9834d4c12..e789792a36bc 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -2289,11 +2289,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)
 			err = -ENODEV;
 			goto error;
 		}
-		msleep_interruptible(50);
-		if (signal_pending(current)) {
-			err = -EINTR;
-			goto error;
-		}
+		msleep(50);
 	}
 	b43_read32(dev, B43_MMIO_GEN_IRQ_REASON);	/* dummy read */