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/tty/ipwireless/hardware.c | |
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/tty/ipwireless/hardware.c')
-rw-r--r-- | drivers/tty/ipwireless/hardware.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c index 5c77e1eac4ee..ad7031a4f3c4 100644 --- a/drivers/tty/ipwireless/hardware.c +++ b/drivers/tty/ipwireless/hardware.c | |||
@@ -1455,7 +1455,7 @@ static void __handle_setup_get_version_rsp(struct ipw_hardware *hw) | |||
1455 | return; | 1455 | return; |
1456 | } | 1456 | } |
1457 | 1457 | ||
1458 | set_RTS(hw, PRIO_SETUP, channel_idx, | 1458 | ret = set_RTS(hw, PRIO_SETUP, channel_idx, |
1459 | (hw->control_lines [channel_idx] & | 1459 | (hw->control_lines [channel_idx] & |
1460 | IPW_CONTROL_LINE_RTS) != 0); | 1460 | IPW_CONTROL_LINE_RTS) != 0); |
1461 | if (ret) { | 1461 | if (ret) { |