summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Kufner <wolfgang.kufner@gmail.com>2010-12-13 12:39:39 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-12-13 15:23:37 -0500
commit412b31334b831a8c2909afaca017c5a236ac2dd0 (patch)
treef10d03d9fe5fa65abc265983aa3d0229e5e2d5bd
parent739fd9405416e22732e46a9226a8cac379bd57fc (diff)
rt2x00: Fix firmware loading regression on x86_64.
Commit 6175ddf06b6172046a329e3abfd9c901a43efd2e changes the way memcpy_toio() works for x86_64, causing firmware loading to fail for some Ralink WLAN devices with the rt2800pci driver since linux 2.6.34. This causes the log message: "phy0 -> rt2800pci_load_firmware: Error - PBF system register not ready.". Fix this by using __iowrite32_copy instead of memcpy_toio(). Signed-off-by: Wolfgang Kufner <wolfgang.kufner@gmail.com> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00pci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h
index b854d62ff99..746ce8fe8cf 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.h
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.h
@@ -64,7 +64,7 @@ static inline void rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,
const void *value,
const u32 length)
{
- memcpy_toio(rt2x00dev->csr.base + offset, value, length);
+ __iowrite32_copy(rt2x00dev->csr.base + offset, value, length >> 2);
}
/**