Commit 4e47dcf7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-4.2-rc1' of... 

Merge tag 'usb-serial-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-next

Johan writes:

USB-serial updates for v4.2-rc1

Just a minor clean up of mos7840 this time.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents b3d424e3 f05b7cb6

drivers/usb/serial/mos7840.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -2301,17 +2301,14 @@ static int mos7840_port_probe(struct usb_serial_port *port) 
			goto error;

			goto error;

		}

		}





		init_timer(&mos7840_port->led_timer1);

		setup_timer(&mos7840_port->led_timer1, mos7840_led_off,

		mos7840_port->led_timer1.function = mos7840_led_off;

			    (unsigned long)mos7840_port);

		mos7840_port->led_timer1.expires =

		mos7840_port->led_timer1.expires =

			jiffies + msecs_to_jiffies(LED_ON_MS);

			jiffies + msecs_to_jiffies(LED_ON_MS);

		mos7840_port->led_timer1.data = (unsigned long)mos7840_port;

		setup_timer(&mos7840_port->led_timer2, mos7840_led_flag_off,



			    (unsigned long)mos7840_port);

		init_timer(&mos7840_port->led_timer2);

		mos7840_port->led_timer2.function = mos7840_led_flag_off;

		mos7840_port->led_timer2.expires =

		mos7840_port->led_timer2.expires =

			jiffies + msecs_to_jiffies(LED_OFF_MS);

			jiffies + msecs_to_jiffies(LED_OFF_MS);

		mos7840_port->led_timer2.data = (unsigned long)mos7840_port;





		/* Turn off LED */

		/* Turn off LED */

		mos7840_set_led_sync(port, MODEM_CONTROL_REGISTER, 0x0300);

		mos7840_set_led_sync(port, MODEM_CONTROL_REGISTER, 0x0300);