diff options
| author |   Steve Glendinning <steve.glendinning@shawell.net> | 2012-12-10 01:03:08 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-12-10 14:09:00 -0500 |
| commit | 7b9e75802f1c50bfeae53c86c0bfbc5c45fd8719 (patch) | |
| tree | 45dcd42dc9865af9b285028c768e87efa154db35 /drivers/net/usb/smsc95xx.c | |
| parent | smsc95xx: fix register dump of last register (diff) | |
| download | linux-dev-7b9e75802f1c50bfeae53c86c0bfbc5c45fd8719.tar.xz linux-dev-7b9e75802f1c50bfeae53c86c0bfbc5c45fd8719.zip | |
smsc95xx: fix async register writes on big endian platforms
This patch fixes a missing endian conversion which results in the
interface failing to come up on BE platforms.
It also removes an unnecessary pointer dereference from this
function.
Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/smsc95xx.c')
| -rw-r--r-- | drivers/net/usb/smsc95xx.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index a00dcc484f9c..9b736701f854 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -421,15 +421,19 @@ static int smsc95xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length, } static int __must_check smsc95xx_write_reg_async(struct usbnet *dev, u16 index, - u32 *data) + u32 data) { const u16 size = 4; + u32 buf; int ret; + buf = data; + cpu_to_le32s(&buf); + ret = usbnet_write_cmd_async(dev, USB_VENDOR_REQUEST_WRITE_REGISTER, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0, index, data, size); + 0, index, &buf, size); if (ret < 0) netdev_warn(dev->net, "Error write async cmd, sts=%d\n", ret); @@ -490,15 +494,15 @@ static void smsc95xx_set_multicast(struct net_device *netdev) spin_unlock_irqrestore(&pdata->mac_cr_lock, flags); /* Initiate async writes, as we can't wait for completion here */ - ret = smsc95xx_write_reg_async(dev, HASHH, &pdata->hash_hi); + ret = smsc95xx_write_reg_async(dev, HASHH, pdata->hash_hi); if (ret < 0) netdev_warn(dev->net, "failed to initiate async write to HASHH\n"); - ret = smsc95xx_write_reg_async(dev, HASHL, &pdata->hash_lo); + ret = smsc95xx_write_reg_async(dev, HASHL, pdata->hash_lo); if (ret < 0) netdev_warn(dev->net, "failed to initiate async write to HASHL\n"); - ret = smsc95xx_write_reg_async(dev, MAC_CR, &pdata->mac_cr); + ret = smsc95xx_write_reg_async(dev, MAC_CR, pdata->mac_cr); if (ret < 0) netdev_warn(dev->net, "failed to initiate async write to MAC_CR\n"); } |