Commit e175e996 authored Sep 11, 2009 by Michael Buesch Committed by John W. Linville Sep 14, 2009

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>

parent 54a68d14

drivers/net/wireless/b43/main.c

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -2289,11 +2289,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)
	err = -ENODEV;		err = -ENODEV;
	goto error;		goto error;
	}		}
	msleep_interruptible(50);		msleep(50);
	if (signal_pending(current)) {
	err = -EINTR;
	goto error;
	}
	}		}
	b43_read32(dev, B43_MMIO_GEN_IRQ_REASON); /* dummy read */		b43_read32(dev, B43_MMIO_GEN_IRQ_REASON); /* dummy read */