aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorhayeswang <hayeswang@realtek.com>2016-07-07 03:09:19 -0400
committerDavid S. Miller <davem@davemloft.net>2016-07-09 17:48:05 -0400
commitc79262f3f8e06e75e960ff45b48b3c12b2d6b709 (patch)
tree06ee4b0939a5d661e7073d7a132a4f51f1483a04 /drivers/net/usb
parentb1648066b41f01057e2b802f71410bddae8dce45 (diff)
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.c2
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)
3111 if (res) 3111 if (res)
3112 goto out; 3112 goto out;
3113 3113
3114 netif_carrier_off(netdev);
3115
3116 res = usb_autopm_get_interface(tp->intf); 3114 res = usb_autopm_get_interface(tp->intf);
3117 if (res < 0) { 3115 if (res < 0) {
3118 free_all_mem(tp); 3116 free_all_mem(tp);