]> git.karo-electronics.de Git - linux-beck.git/commitdiff
tty: ipwireless, cleanup TIOCGSERIAL
authorJiri Slaby <jslaby@suse.cz>
Mon, 9 May 2016 07:11:53 +0000 (09:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 25 Jun 2016 15:56:30 +0000 (08:56 -0700)
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>
drivers/tty/ipwireless/tty.c

index 345cebb07ae7933156784e46956c78983acf2e29..2685d59d27245ca5a4d7b00d15e7938cdbd4d837 100644 (file)
@@ -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;