Commit a2a5f1a2 authored May 09, 2016 by Jiri Slaby Committed by Greg Kroah-Hartman Jun 25, 2016

net: ircomm, cleanup TIOCGSERIAL



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>

parent fec4daec

net/irda/ircomm/ircomm_tty_ioctl.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -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;