| From 214ac9a4ead6cb254451c09d9c8234a76693feb1 Mon Sep 17 00:00:00 2001 |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| Date: Wed, 9 Dec 2009 13:25:56 -0600 |
| Subject: b43: Remove reset after fatal DMA error |
| |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| |
| commit 214ac9a4ead6cb254451c09d9c8234a76693feb1 upstream. |
| |
| 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> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Cc: maximilian attems <max@stro.at> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/wireless/b43/main.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/wireless/b43/main.c |
| +++ b/drivers/net/wireless/b43/main.c |
| @@ -1788,7 +1788,10 @@ static void b43_do_interrupt_thread(stru |
| 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) { |
