projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nds32-for-linus-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
drivers
/
net
/
usb
/
cdc_ncm.c
diff --git
a/drivers/net/usb/cdc_ncm.c
b/drivers/net/usb/cdc_ncm.c
index
b0e8b96
..
1eaec64
100644
(file)
--- a/
drivers/net/usb/cdc_ncm.c
+++ b/
drivers/net/usb/cdc_ncm.c
@@
-967,8
+967,7
@@
void cdc_ncm_unbind(struct usbnet *dev, struct usb_interface *intf)
atomic_set(&ctx->stop, 1);
- if (hrtimer_active(&ctx->tx_timer))
- hrtimer_cancel(&ctx->tx_timer);
+ hrtimer_cancel(&ctx->tx_timer);
tasklet_kill(&ctx->bh);