diff options
| author |   hayeswang <hayeswang@realtek.com> | 2016-07-07 15:09:19 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-07-09 17:48:05 -0400 |
| commit | c79262f3f8e06e75e960ff45b48b3c12b2d6b709 (patch) | |
| tree | 06ee4b0939a5d661e7073d7a132a4f51f1483a04 /drivers/net/usb | |
| parent | r8152: remove rtl_phy_reset function (diff) | |
| download | linux-dev-c79262f3f8e06e75e960ff45b48b3c12b2d6b709.tar.xz linux-dev-c79262f3f8e06e75e960ff45b48b3c12b2d6b709.zip | |
r8152: remove a netif_carrier_off in rtl8152_open function
After commit 90186af404ad ("r8152: fix lockup when runtime PM is enabled"),
the autoresume wouldn't start the device before rtl8152_open() is finished.
Therefore, we don't have to reset the linking status before and after
autoresume. That is, one of netif_carrier_off() in rtl8152_open() could be
removed.
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.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index e005ee648efe..f1c502026cae 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -3111,8 +3111,6 @@ static int rtl8152_open(struct net_device *netdev) if (res) goto out; - netif_carrier_off(netdev); - res = usb_autopm_get_interface(tp->intf); if (res < 0) { free_all_mem(tp); |