releases/2.6.32.12/b43-remove-reset-after-fatal-dma-error.patch

   1 From 214ac9a4ead6cb254451c09d9c8234a76693feb1 Mon Sep 17 00:00:00 2001
   2 From: Larry Finger <Larry.Finger@lwfinger.net>
   3 Date: Wed, 9 Dec 2009 13:25:56 -0600
   4 Subject: b43: Remove reset after fatal DMA error
   5
   6 From: Larry Finger <Larry.Finger@lwfinger.net>
   7
   8 commit 214ac9a4ead6cb254451c09d9c8234a76693feb1 upstream.
   9
  10 As shown in Kernel Bugzilla #14761, doing a controller restart after a
  11 fatal DMA error does not accomplish anything other than consume the CPU
  12 on an affected system. Accordingly, substitute a meaningful message for
  13 the restart.
  14
  15 Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
  16 Signed-off-by: John W. Linville <linville@tuxdriver.com>
  17 Cc: maximilian attems <max@stro.at>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19
  20 ---
  21  drivers/net/wireless/b43/main.c |    5 ++++-
  22  1 file changed, 4 insertions(+), 1 deletion(-)
  23
  24 --- a/drivers/net/wireless/b43/main.c
  25 +++ b/drivers/net/wireless/b43/main.c
  26 @@ -1788,7 +1788,10 @@ static void b43_do_interrupt_thread(stru
  27                                dma_reason[0], dma_reason[1],
  28                                dma_reason[2], dma_reason[3],
  29                                dma_reason[4], dma_reason[5]);
  30 -                       b43_controller_restart(dev, "DMA error");
  31 +                       b43err(dev->wl, "This device does not support DMA "
  32 +                              "on your system. Please use PIO instead.\n");
  33 +                       b43err(dev->wl, "CONFIG_B43_FORCE_PIO must be set in "
  34 +                              "your kernel configuration.\n");
  35                         return;
  36                 }
  37                 if (merged_dma_reason & B43_DMAIRQ_NONFATALMASK) {