From patchwork Sat Nov 7 17:54:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Buesch X-Patchwork-Id: 58330 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 nA7HuRVC017359 for ; Sat, 7 Nov 2009 17:56:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752626AbZKGR4V (ORCPT ); Sat, 7 Nov 2009 12:56:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752612AbZKGR4U (ORCPT ); Sat, 7 Nov 2009 12:56:20 -0500 Received: from bu3sch.de ([62.75.166.246]:34465 "EHLO vs166246.vserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752597AbZKGR4U (ORCPT ); Sat, 7 Nov 2009 12:56:20 -0500 Received: by vs166246.vserver.de with esmtpa (Exim 4.69) id 1N6pWS-0003cm-Dg; Sat, 07 Nov 2009 17:56:24 +0000 From: Michael Buesch To: "John W. Linville" Subject: [PATCH] b43-pio: Fix RX error path for rev>=8 devices Date: Sat, 7 Nov 2009 18:54:22 +0100 User-Agent: KMail/1.9.9 Cc: Broadcom Wireless , "linux-wireless" MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200911071854.22748.mb@bu3sch.de> 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/pio.c =================================================================== --- wireless-testing.orig/drivers/net/wireless/b43/pio.c 2009-11-01 13:58:48.000000000 +0100 +++ wireless-testing/drivers/net/wireless/b43/pio.c 2009-11-07 18:46:11.000000000 +0100 @@ -762,7 +762,11 @@ data_ready: rx_error: if (err_msg) b43dbg(q->dev->wl, "PIO RX error: %s\n", err_msg); - b43_piorx_write16(q, B43_PIO_RXCTL, B43_PIO_RXCTL_DATARDY); + if (q->rev >= 8) + b43_piorx_write32(q, B43_PIO8_RXCTL, B43_PIO8_RXCTL_DATARDY); + else + b43_piorx_write16(q, B43_PIO_RXCTL, B43_PIO_RXCTL_DATARDY); + return 1; }