浏览代码

b43: Fix resume failure

This fixes a resume failure where a signal is pending on resume
so the firmware upload fails.
This removes the interruptible sleep, because we don't really need it.
In the worst case (with broken firmware) the sleep loop will take 1 second.
In the common case (working firmware), it will only take a few milliseconds.
So we don't really need to be interruptible.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Michael Buesch 16 年之前
父节点
当前提交
e175e99646
共有 1 个文件被更改,包括 1 次插入5 次删除
  1. 1 5
      drivers/net/wireless/b43/main.c

+ 1 - 5
drivers/net/wireless/b43/main.c

@@ -2289,11 +2289,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)
 			err = -ENODEV;
 			err = -ENODEV;
 			goto error;
 			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 */
 	b43_read32(dev, B43_MMIO_GEN_IRQ_REASON);	/* dummy read */