diff options
| author | Steve Glendinning <steve.glendinning@shawell.net> | 2012-12-09 20:03:08 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-10 14:09:00 -0500 |
| commit | 7b9e75802f1c50bfeae53c86c0bfbc5c45fd8719 (patch) | |
| tree | 45dcd42dc9865af9b285028c768e87efa154db35 | |
| parent | 9624531701ea84f4b7eb966284b53b34b1c52365 (diff) | |
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>
| -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, | |||
| 421 | } | 421 | } |
| 422 | 422 | ||
| 423 | static int __must_check smsc95xx_write_reg_async(struct usbnet *dev, u16 index, | 423 | static int __must_check smsc95xx_write_reg_async(struct usbnet *dev, u16 index, |
| 424 | u32 *data) | 424 | u32 data) |
| 425 | { | 425 | { |
| 426 | const u16 size = 4; | 426 | const u16 size = 4; |
| 427 | u32 buf; | ||
| 427 | int ret; | 428 | int ret; |
| 428 | 429 | ||
| 430 | buf = data; | ||
| 431 | cpu_to_le32s(&buf); | ||
| 432 | |||
| 429 | ret = usbnet_write_cmd_async(dev, USB_VENDOR_REQUEST_WRITE_REGISTER, | 433 | ret = usbnet_write_cmd_async(dev, USB_VENDOR_REQUEST_WRITE_REGISTER, |
| 430 | USB_DIR_OUT | USB_TYPE_VENDOR | | 434 | USB_DIR_OUT | USB_TYPE_VENDOR | |
| 431 | USB_RECIP_DEVICE, | 435 | USB_RECIP_DEVICE, |
| 432 | 0, index, data, size); | 436 | 0, index, &buf, size); |
| 433 | if (ret < 0) | 437 | if (ret < 0) |
| 434 | netdev_warn(dev->net, "Error write async cmd, sts=%d\n", | 438 | netdev_warn(dev->net, "Error write async cmd, sts=%d\n", |
| 435 | ret); | 439 | ret); |
| @@ -490,15 +494,15 @@ static void smsc95xx_set_multicast(struct net_device *netdev) | |||
| 490 | spin_unlock_irqrestore(&pdata->mac_cr_lock, flags); | 494 | spin_unlock_irqrestore(&pdata->mac_cr_lock, flags); |
| 491 | 495 | ||
| 492 | /* Initiate async writes, as we can't wait for completion here */ | 496 | /* Initiate async writes, as we can't wait for completion here */ |
| 493 | ret = smsc95xx_write_reg_async(dev, HASHH, &pdata->hash_hi); | 497 | ret = smsc95xx_write_reg_async(dev, HASHH, pdata->hash_hi); |
| 494 | if (ret < 0) | 498 | if (ret < 0) |
| 495 | netdev_warn(dev->net, "failed to initiate async write to HASHH\n"); | 499 | netdev_warn(dev->net, "failed to initiate async write to HASHH\n"); |
| 496 | 500 | ||
| 497 | ret = smsc95xx_write_reg_async(dev, HASHL, &pdata->hash_lo); | 501 | ret = smsc95xx_write_reg_async(dev, HASHL, pdata->hash_lo); |
| 498 | if (ret < 0) | 502 | if (ret < 0) |
| 499 | netdev_warn(dev->net, "failed to initiate async write to HASHL\n"); | 503 | netdev_warn(dev->net, "failed to initiate async write to HASHL\n"); |
| 500 | 504 | ||
| 501 | ret = smsc95xx_write_reg_async(dev, MAC_CR, &pdata->mac_cr); | 505 | ret = smsc95xx_write_reg_async(dev, MAC_CR, pdata->mac_cr); |
| 502 | if (ret < 0) | 506 | if (ret < 0) |
| 503 | netdev_warn(dev->net, "failed to initiate async write to MAC_CR\n"); | 507 | netdev_warn(dev->net, "failed to initiate async write to MAC_CR\n"); |
| 504 | } | 508 | } |
