From 56216ce9b99ec5ce072b8cfd6c0672cfa0e951d4 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 16 Mar 2008 22:43:06 +0000 Subject: [PATCH] --- yaml --- r: 90481 b: refs/heads/master c: 717ddc0ebdd00c233fcb1ae9a243e69f301cde24 h: refs/heads/master i: 90479: 74fe0c07c2cf026fbccd480516c5eb4064af1b3b v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rtl8180_dev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 98cde9d48f0f..4ff7624b95d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfb12eb70fc926562488515a9596c88b8eadc545 +refs/heads/master: 717ddc0ebdd00c233fcb1ae9a243e69f301cde24 diff --git a/trunk/drivers/net/wireless/rtl8180_dev.c b/trunk/drivers/net/wireless/rtl8180_dev.c index b1b3a478335b..c181f23e930d 100644 --- a/trunk/drivers/net/wireless/rtl8180_dev.c +++ b/trunk/drivers/net/wireless/rtl8180_dev.c @@ -688,9 +688,9 @@ static int rtl8180_add_interface(struct ieee80211_hw *dev, rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG); rtl818x_iowrite32(priv, (__le32 __iomem *)&priv->map->MAC[0], - cpu_to_le32(*(u32 *)conf->mac_addr)); + le32_to_cpu(*(__le32 *)conf->mac_addr)); rtl818x_iowrite16(priv, (__le16 __iomem *)&priv->map->MAC[4], - cpu_to_le16(*(u16 *)(conf->mac_addr + 4))); + le16_to_cpu(*(__le16 *)(conf->mac_addr + 4))); rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL); return 0;