diff options
| author |   Igor Russkikh <Igor.Russkikh@aquantia.com> | 2019-05-16 14:52:20 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-05-16 14:22:13 -0700 |
| commit | 5aee080f2cf18215dfc10ad2bb4be29fa7381050 (patch) | |
| tree | 70b37e0aa3eaa087a3dcb9503d4ae4169eee04f0 /drivers | |
| parent | xfrm: ressurrect "Fix uninitialized memory read in _decode_session4" (diff) | |
| download | linux-dev-5aee080f2cf18215dfc10ad2bb4be29fa7381050.tar.xz linux-dev-5aee080f2cf18215dfc10ad2bb4be29fa7381050.zip | |
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')
| -rw-r--r-- | drivers/net/usb/aqc111.c | 6 |
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) { struct usbnet *dev = usb_get_intfdata(intf); struct aqc111_data *aqc111_data = dev->driver_priv; - u16 reg16, oldreg16; + u16 reg16; u8 reg8; netif_carrier_off(dev->net); @@ -1444,11 +1444,9 @@ static int aqc111_resume(struct usb_interface *intf) /* Configure RX control register => start operation */ reg16 = aqc111_data->rxctl; reg16 &= ~SFR_RX_CTL_START; - /* needs to be saved in case endianness is swapped */ - oldreg16 = reg16; aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, ®16); - reg16 = oldreg16 | SFR_RX_CTL_START; + reg16 |= SFR_RX_CTL_START; aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, ®16); aqc111_set_phy_speed(dev, aqc111_data->autoneg, |