summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorIgor Russkikh <Igor.Russkikh@aquantia.com>2019-05-16 10:52:20 -0400
committerDavid S. Miller <davem@davemloft.net>2019-05-16 17:22:13 -0400
commit5aee080f2cf18215dfc10ad2bb4be29fa7381050 (patch)
tree70b37e0aa3eaa087a3dcb9503d4ae4169eee04f0 /drivers/net/usb
parent858e5400e682370d0f8d217fcd6fd6ae5b256f5f (diff)
Revert "aqc111: fix double endianness swap on BE"
This reverts commit 2cf672709beb005f6e90cb4edbed6f2218ba953e. The required temporary storage is already done inside of write32/16 helpers. Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/aqc111.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c
index b86c5ce9a92a..599d560a8450 100644
--- a/drivers/net/usb/aqc111.c
+++ b/drivers/net/usb/aqc111.c
@@ -1428,7 +1428,7 @@ static int aqc111_resume(struct usb_interface *intf)
1428{ 1428{
1429 struct usbnet *dev = usb_get_intfdata(intf); 1429 struct usbnet *dev = usb_get_intfdata(intf);
1430 struct aqc111_data *aqc111_data = dev->driver_priv; 1430 struct aqc111_data *aqc111_data = dev->driver_priv;
1431 u16 reg16, oldreg16; 1431 u16 reg16;
1432 u8 reg8; 1432 u8 reg8;
1433 1433
1434 netif_carrier_off(dev->net); 1434 netif_carrier_off(dev->net);
@@ -1444,11 +1444,9 @@ static int aqc111_resume(struct usb_interface *intf)
1444 /* Configure RX control register => start operation */ 1444 /* Configure RX control register => start operation */
1445 reg16 = aqc111_data->rxctl; 1445 reg16 = aqc111_data->rxctl;
1446 reg16 &= ~SFR_RX_CTL_START; 1446 reg16 &= ~SFR_RX_CTL_START;
1447 /* needs to be saved in case endianness is swapped */
1448 oldreg16 = reg16;
1449 aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, &reg16); 1447 aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, &reg16);
1450 1448
1451 reg16 = oldreg16 | SFR_RX_CTL_START; 1449 reg16 |= SFR_RX_CTL_START;
1452 aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, &reg16); 1450 aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, &reg16);
1453 1451
1454 aqc111_set_phy_speed(dev, aqc111_data->autoneg, 1452 aqc111_set_phy_speed(dev, aqc111_data->autoneg,