diff options
author | Jiri Slaby <jslaby@suse.cz> | 2016-05-09 03:11:53 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 11:56:30 -0400 |
commit | fec4daecadcf3b73facf6b48ed03453c96c7f2dd (patch) | |
tree | c682add1960de8492d3418f2fe231478d8bf9adb /drivers/tty/ipwireless | |
parent | 33688abb2802ff3a230bd2441f765477b94cc89e (diff) |
tty: ipwireless, cleanup TIOCGSERIAL
In ipwireless_get_serial_info, struct serial_struct is memset to 0 and
then some members set to 0 explicitly.
Remove the latter as it is obviously superfluous.
And remove the retinfo check against NULL. copy_to_user will take care
of that.
Part of hub6 cleanup series.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Jiri Kosina <jikos@kernel.org>
Acked-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/ipwireless')
-rw-r--r-- | drivers/tty/ipwireless/tty.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c index 345cebb07ae7..2685d59d2724 100644 --- a/drivers/tty/ipwireless/tty.c +++ b/drivers/tty/ipwireless/tty.c | |||
@@ -252,20 +252,11 @@ static int ipwireless_get_serial_info(struct ipw_tty *tty, | |||
252 | { | 252 | { |
253 | struct serial_struct tmp; | 253 | struct serial_struct tmp; |
254 | 254 | ||
255 | if (!retinfo) | ||
256 | return (-EFAULT); | ||
257 | |||
258 | memset(&tmp, 0, sizeof(tmp)); | 255 | memset(&tmp, 0, sizeof(tmp)); |
259 | tmp.type = PORT_UNKNOWN; | 256 | tmp.type = PORT_UNKNOWN; |
260 | tmp.line = tty->index; | 257 | tmp.line = tty->index; |
261 | tmp.port = 0; | ||
262 | tmp.irq = 0; | ||
263 | tmp.flags = 0; | ||
264 | tmp.baud_base = 115200; | 258 | tmp.baud_base = 115200; |
265 | tmp.close_delay = 0; | 259 | |
266 | tmp.closing_wait = 0; | ||
267 | tmp.custom_divisor = 0; | ||
268 | tmp.hub6 = 0; | ||
269 | if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) | 260 | if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) |
270 | return -EFAULT; | 261 | return -EFAULT; |
271 | 262 | ||