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

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>

parent 33688abb

drivers/tty/ipwireless/tty.c

+1 −10

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

Admin message