From a851bec9963f635e070254b708ec23d168fa3456 Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Sat, 7 Nov 2009 18:54:22 +0100 Subject: [PATCH] --- yaml --- r: 171657 b: refs/heads/master c: c286181d5bfd8703219b954284143cfadff60b9b h: refs/heads/master i: 171655: 89f53fce2d2fbd8bbc7ab1af5b40044db39a88ec v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/pio.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4075ffa42a89..4f3f3296b061 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a6a5c7af130e703c23d23ebe3cde23e079e554e +refs/heads/master: c286181d5bfd8703219b954284143cfadff60b9b diff --git a/trunk/drivers/net/wireless/b43/pio.c b/trunk/drivers/net/wireless/b43/pio.c index 3105f235303a..7d2550269ede 100644 --- a/trunk/drivers/net/wireless/b43/pio.c +++ b/trunk/drivers/net/wireless/b43/pio.c @@ -761,7 +761,11 @@ static bool pio_rx_frame(struct b43_pio_rxqueue *q) 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; }