diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 12:50:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 12:50:27 -0400 |
commit | d0bbe0dd353af9521e9d8bc5236308c677b6f62a (patch) | |
tree | a1142f3a5058d16504863ac777b21efdf1eca49e /drivers/net/wireless/ath/wcn36xx | |
parent | 8de29a35dc840a05e451ad035bcb06e21ccf605f (diff) | |
parent | 0e4f93e5017d9d8080bbd34db17836e090eb46fe (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Usual trivial tree updates. Nothing outstanding -- mostly printk()
and comment fixes and unused identifier removals"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
goldfish: goldfish_tty_probe() is not using 'i' any more
powerpc: Fix comment in smu.h
qla2xxx: Fix printks in ql_log message
lib: correct link to the original source for div64_u64
si2168, tda10071, m88ds3103: Fix firmware wording
usb: storage: Fix printk in isd200_log_config()
qla2xxx: Fix printk in qla25xx_setup_mode
init/main: fix reset_device comment
ipwireless: missing assignment
goldfish: remove unreachable line of code
coredump: Fix do_coredump() comment
stacktrace.h: remove duplicate declaration task_struct
smpboot.h: Remove unused function prototype
treewide: Fix typo in printk messages
treewide: Fix typo in printk messages
mod_devicetable: fix comment for match_flags
Diffstat (limited to 'drivers/net/wireless/ath/wcn36xx')
-rw-r--r-- | drivers/net/wireless/ath/wcn36xx/smd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index 69ed39731902..dbd894428be6 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c | |||
@@ -1701,7 +1701,7 @@ int wcn36xx_smd_keep_alive_req(struct wcn36xx *wcn, | |||
1701 | } else if (packet_type == WCN36XX_HAL_KEEP_ALIVE_UNSOLICIT_ARP_RSP) { | 1701 | } else if (packet_type == WCN36XX_HAL_KEEP_ALIVE_UNSOLICIT_ARP_RSP) { |
1702 | /* TODO: it also support ARP response type */ | 1702 | /* TODO: it also support ARP response type */ |
1703 | } else { | 1703 | } else { |
1704 | wcn36xx_warn("unknow keep alive packet type %d\n", packet_type); | 1704 | wcn36xx_warn("unknown keep alive packet type %d\n", packet_type); |
1705 | ret = -EINVAL; | 1705 | ret = -EINVAL; |
1706 | goto out; | 1706 | goto out; |
1707 | } | 1707 | } |