From 1333c527cdf9b4c180bcc26b391b330524b65f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Tue, 16 Aug 2011 21:44:21 +0200
Subject: [PATCH] --- yaml --- r: 265663 b: refs/heads/master c:
 cbe1e82a543dae06ffdba9bc108a1a22dc55cde3 h: refs/heads/master i:   265661:
 1457109b773bcd2c20dda63c0a3a352f7563eff8   265659:
 85fa79fa5ca7fdd690b9541a864472ef39cc66c5   265655:
 eb2527d1d1d95df978f7c297df793da1521f26e2   265647:
 f912466747195b07ed18e1b94c72c8f0faf8991b   265631:
 24ab057c43edb04d380740c50d427f493701329b   265599:
 64cc843d7257ee02ca927a644562452a75e43b8e v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/wireless/b43/main.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 60558d814038..69c903fdffc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 948990251508d8d41f5dd2c9988d415fb8fb49c7
+refs/heads/master: cbe1e82a543dae06ffdba9bc108a1a22dc55cde3
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index b5e83057dab3..bf17516c663b 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -4654,8 +4654,13 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
 	b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MAXCONT, 0x3FF);
 
 	if (b43_bus_host_is_pcmcia(dev->dev) ||
-	    b43_bus_host_is_sdio(dev->dev) ||
-	    dev->use_pio) {
+	    b43_bus_host_is_sdio(dev->dev)) {
+		dev->__using_pio_transfers = 1;
+		err = b43_pio_init(dev);
+	} else if (dev->use_pio) {
+		b43warn(dev->wl, "Forced PIO by use_pio module parameter. "
+			"This should not be needed and will result in lower "
+			"performance.\n");
 		dev->__using_pio_transfers = 1;
 		err = b43_pio_init(dev);
 	} else {