From a2421a362a2e2b8f36072ddc6faa2288576c4667 Mon Sep 17 00:00:00 2001 From: Steve Glendinning Date: Mon, 10 Dec 2012 01:03:08 +0000 Subject: [PATCH] --- yaml --- r: 342062 b: refs/heads/master c: 7b9e75802f1c50bfeae53c86c0bfbc5c45fd8719 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/smsc95xx.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index cddcbd83ee32..e7659d756e54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9624531701ea84f4b7eb966284b53b34b1c52365 +refs/heads/master: 7b9e75802f1c50bfeae53c86c0bfbc5c45fd8719 diff --git a/trunk/drivers/net/usb/smsc95xx.c b/trunk/drivers/net/usb/smsc95xx.c index a00dcc484f9c..9b736701f854 100644 --- a/trunk/drivers/net/usb/smsc95xx.c +++ b/trunk/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"); }