diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2009-12-09 13:25:56 -0600 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-10 16:09:51 -0500 |
| commit | 214ac9a4ead6cb254451c09d9c8234a76693feb1 (patch) | |
| tree | 06bfa3ef4495d2f969fbe25ed4b7d41a9b81849e | |
| parent | 49d7590ce494a971311ca55d8aaa6ea9a87b108f (diff) | |
| download | linux-214ac9a4ead6cb254451c09d9c8234a76693feb1.tar.bz2 | |
b43: Remove reset after fatal DMA error
As shown in Kernel Bugzilla #14761, doing a controller restart after a
fatal DMA error does not accomplish anything other than consume the CPU
on an affected system. Accordingly, substitute a meaningful message for
the restart.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org> [2.6.32]
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 077480c4916a..19b4eae47b59 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -1784,7 +1784,10 @@ static void b43_do_interrupt_thread(struct b43_wldev *dev) dma_reason[0], dma_reason[1], dma_reason[2], dma_reason[3], dma_reason[4], dma_reason[5]); - b43_controller_restart(dev, "DMA error"); + b43err(dev->wl, "This device does not support DMA " + "on your system. Please use PIO instead.\n"); + b43err(dev->wl, "CONFIG_B43_FORCE_PIO must be set in " + "your kernel configuration.\n"); return; } if (merged_dma_reason & B43_DMAIRQ_NONFATALMASK) { |