diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-07-16 17:59:03 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-16 17:59:03 -0400 |
commit | 5be808467347fc99bdd216883c5dbd123d6ad9d6 (patch) | |
tree | 7fe3f1ee051d261bb3739c5f9f1bb8489a0d6f71 /drivers/net/wireless/rtl8187_rtl8225.c | |
parent | 8910b49fbb8d4517a20bb3de7dc239dcfa7d2b6f (diff) | |
parent | 4cf92a3cd9117cb90ad9441172b9f42b67ee9d26 (diff) | |
download | talos-op-linux-5be808467347fc99bdd216883c5dbd123d6ad9d6.tar.gz talos-op-linux-5be808467347fc99bdd216883c5dbd123d6ad9d6.zip |
Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/rtl8187_rtl8225.c')
-rw-r--r-- | drivers/net/wireless/rtl8187_rtl8225.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtl8187_rtl8225.c b/drivers/net/wireless/rtl8187_rtl8225.c index e25a09f1b068..efc41207780e 100644 --- a/drivers/net/wireless/rtl8187_rtl8225.c +++ b/drivers/net/wireless/rtl8187_rtl8225.c @@ -67,7 +67,7 @@ static void rtl8225_write_bitbang(struct ieee80211_hw *dev, u8 addr, u16 data) msleep(2); } -static void rtl8225_write_8051(struct ieee80211_hw *dev, u8 addr, u16 data) +static void rtl8225_write_8051(struct ieee80211_hw *dev, u8 addr, __le16 data) { struct rtl8187_priv *priv = dev->priv; u16 reg80, reg82, reg84; @@ -106,7 +106,7 @@ void rtl8225_write(struct ieee80211_hw *dev, u8 addr, u16 data) struct rtl8187_priv *priv = dev->priv; if (priv->asic_rev) - rtl8225_write_8051(dev, addr, data); + rtl8225_write_8051(dev, addr, cpu_to_le16(data)); else rtl8225_write_bitbang(dev, addr, data); } |