diff options
author | Richard Chang <dickchang@google.com> | 2016-08-24 23:10:51 +0000 |
---|---|---|
committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2016-08-24 23:10:51 +0000 |
commit | c2fb65a2f086192b437b010b7d8ce05f2cbbb28b (patch) | |
tree | ff02b4bbb1e33c2c33cdd9ad976fcb59845f3b73 | |
parent | 7282bbe23c18dc2486160bd130cd9ddad72f2507 (diff) | |
parent | 80d7e637b0c83806ad7f99c1c65dd9e9a732e95f (diff) |
Merge "usbnet: cleanup after bind() in probe()" into mnc-dr-dev-qcom-legoandroid-lego-6.0.1_r0.7
-rw-r--r-- | drivers/net/usb/usbnet.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 660f2e6bffb0..92b1d4bd04e6 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1982,6 +1982,13 @@ out3: if (info->unbind) info->unbind (dev, udev); out1: + /* subdrivers must undo all they did in bind() if they + * fail it, but we may fail later and a deferred kevent + * may trigger an error resubmitting itself and, worse, + * schedule a timer. So we kill it all just in case. + */ + cancel_work_sync(&dev->kevent); + del_timer_sync(&dev->delay); free_netdev(net); out: return status; |