summaryrefslogtreecommitdiff
path: root/drivers/tty/ipwireless
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2016-05-09 10:11:53 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-25 18:56:30 +0300
commitfec4daecadcf3b73facf6b48ed03453c96c7f2dd (patch)
treec682add1960de8492d3418f2fe231478d8bf9adb /drivers/tty/ipwireless
parent33688abb2802ff3a230bd2441f765477b94cc89e (diff)
downloadlinux-fec4daecadcf3b73facf6b48ed03453c96c7f2dd.tar.xz
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.c11
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,
{
struct serial_struct tmp;
- if (!retinfo)
- return (-EFAULT);
-
memset(&tmp, 0, sizeof(tmp));
tmp.type = PORT_UNKNOWN;
tmp.line = tty->index;
- tmp.port = 0;
- tmp.irq = 0;
- tmp.flags = 0;
tmp.baud_base = 115200;
- tmp.close_delay = 0;
- tmp.closing_wait = 0;
- tmp.custom_divisor = 0;
- tmp.hub6 = 0;
+
if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
return -EFAULT;