aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorhayeswang <hayeswang@realtek.com>2016-07-07 15:09:20 +0800
committerDavid S. Miller <davem@davemloft.net>2016-07-09 17:48:06 -0400
commitc23d86ae94b5eda449e71560e9028907abc91764 (patch)
treeee16d9340d43ba702b3ba7e32836aea7a3461495 /drivers/net/usb
parentr8152: remove a netif_carrier_off in rtl8152_open function (diff)
downloadlinux-dev-c23d86ae94b5eda449e71560e9028907abc91764.tar.xz
linux-dev-c23d86ae94b5eda449e71560e9028907abc91764.zip
r8152: remove cancel_delayed_work_sync in rtl8152_set_speed
There is no conflict between the work_queue function and rtl8152_set_speed(), so we don't have to cancel the delayed work in rtl8152_set_speed(). Signed-off-by: Hayes Wang <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/r8152.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index f1c502026cae..168a8e2e15c8 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -2829,7 +2829,6 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
u16 bmcr, anar, gbcr;
int ret = 0;
- cancel_delayed_work_sync(&tp->schedule);
anar = r8152_mdio_read(tp, MII_ADVERTISE);
anar &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL |
ADVERTISE_100HALF | ADVERTISE_100FULL);