]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
net: ircomm, cleanup TIOCGSERIAL
authorJiri Slaby <jslaby@suse.cz>
Mon, 9 May 2016 07:11:54 +0000 (09:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 25 Jun 2016 15:56:30 +0000 (08:56 -0700)
In ircomm_tty_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: Samuel Ortiz <samuel@sortiz.org>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/irda/ircomm/ircomm_tty_ioctl.c

index d4fdf8f7b47179b39e475dca9833ee6a6c25c4ca..8f5678cb62635cc5c76bba711091929d6054939e 100644 (file)
@@ -246,9 +246,6 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
 {
        struct serial_struct info;
 
-       if (!retinfo)
-               return -EFAULT;
-
        memset(&info, 0, sizeof(info));
        info.line = self->line;
        info.flags = self->port.flags;
@@ -258,11 +255,6 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
 
        /* For compatibility  */
        info.type = PORT_16550A;
-       info.port = 0;
-       info.irq = 0;
-       info.xmit_fifo_size = 0;
-       info.hub6 = 0;
-       info.custom_divisor = 0;
 
        if (copy_to_user(retinfo, &info, sizeof(*retinfo)))
                return -EFAULT;