diff options
| author | Oliver Neukum <oneukum@suse.com> | 2019-05-09 11:08:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-09 18:35:40 +0200 |
| commit | 2cf672709beb005f6e90cb4edbed6f2218ba953e (patch) | |
| tree | 374981415b60d03859a6c8e8b3af81a203ce42be /drivers/net/usb/aqc111.c | |
| parent | aqc111: fix writing to the phy on BE (diff) | |
| download | linux-2cf672709beb005f6e90cb4edbed6f2218ba953e.tar.xz linux-2cf672709beb005f6e90cb4edbed6f2218ba953e.zip | |
aqc111: fix double endianness swap on BE
If you are using a function that does a swap in place,
you cannot just reuse the buffer on the assumption that it has
not been changed.
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/usb/aqc111.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 599d560a8450..b86c5ce9a92a 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; + u16 reg16, oldreg16; u8 reg8; netif_carrier_off(dev->net); @@ -1444,9 +1444,11 @@ 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 |= SFR_RX_CTL_START; + reg16 = oldreg16 | 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, |