From patchwork Wed Dec 9 19:25:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 66064 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB9JRJIJ022385 for ; Wed, 9 Dec 2009 19:27:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757440AbZLIT0G (ORCPT ); Wed, 9 Dec 2009 14:26:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757577AbZLIT0A (ORCPT ); Wed, 9 Dec 2009 14:26:00 -0500 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:40676 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757543AbZLITZz (ORCPT ); Wed, 9 Dec 2009 14:25:55 -0500 X-Authority-Analysis: v=1.0 c=1 a=o7bwqB2qRKAA:10 a=yQdBAQUQAAAA:8 a=VwQbUJbxAAAA:8 a=y9VwgRJqZ_M1m34sytsA:9 a=nANehn9_ucMKs6EZEbQBsJUN-5gA:4 a=IcxpeKGZWnEA:10 X-Cloudmark-Score: 0 X-Originating-IP: 65.28.92.235 Received: from [65.28.92.235] ([65.28.92.235:42189] helo=larrylap.site) by hrndva-oedge03.mail.rr.com (envelope-from ) (ecelerity 2.2.2.39 r()) with ESMTP id D6/FD-16719-4C9FF1B4; Wed, 09 Dec 2009 19:25:57 +0000 Date: Wed, 09 Dec 2009 13:25:56 -0600 From: Larry Finger To: John W Linville , Michael Buesch Cc: bcm43xx-dev@lists.berlios.de, linux-wireless@vger.kernel.org Subject: [PATCH] b43: Remove reset after fatal DMA error Message-ID: <4b1ff9c4.iIvEkDMkYFL2BtFk%Larry.Finger@lwfinger.net> User-Agent: Heirloom mailx 12.2 01/07/07 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Index: wireless-testing/drivers/net/wireless/b43/main.c =================================================================== --- wireless-testing.orig/drivers/net/wireless/b43/main.c +++ wireless-testing/drivers/net/wireless/b43/main.c @@ -1784,7 +1784,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) {