projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
zd1211rw
/
zd_mac.c
diff --git
a/drivers/net/wireless/zd1211rw/zd_mac.c
b/drivers/net/wireless/zd1211rw/zd_mac.c
index 9fcde36d5013d9435d0070e2eadd4c36f5dc21aa..c9e2660e12638d156818367c19cc646064e4aeb3 100644
(file)
--- a/
drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/
drivers/net/wireless/zd1211rw/zd_mac.c
@@
-856,7
+856,7
@@
reset_device:
/* semaphore stuck, reset device to avoid fw freeze later */
dev_warn(zd_mac_dev(mac), "CR_BCN_FIFO_SEMAPHORE stuck, "
- "reseting device...");
+ "reset
t
ing device...");
usb_queue_reset_device(mac->chip.usb.intf);
return r;