mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-07 05:50:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Johan writes:

USB-serial updates for v4.2-rc1

Just a minor clean up of mos7840 this time.

Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Greg Kroah-Hartman
2015-06-05 22:54:34 +09:00
parent b3d424e3dc f05b7cb6f2
commit 4e47dcf78d
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/usb/serial/mos7840.c
View File

@@ -2301,17 +2301,14 @@ static int mos7840_port_probe(struct usb_serial_port *port)
goto error;
}
init_timer(&mos7840_port->led_timer1);
mos7840_port->led_timer1.function = mos7840_led_off;
setup_timer(&mos7840_port->led_timer1, mos7840_led_off,
(unsigned long)mos7840_port);
mos7840_port->led_timer1.expires =
jiffies + msecs_to_jiffies(LED_ON_MS);
mos7840_port->led_timer1.data = (unsigned long)mos7840_port;
init_timer(&mos7840_port->led_timer2);
mos7840_port->led_timer2.function = mos7840_led_flag_off;
setup_timer(&mos7840_port->led_timer2, mos7840_led_flag_off,
(unsigned long)mos7840_port);
mos7840_port->led_timer2.expires =
jiffies + msecs_to_jiffies(LED_OFF_MS);
mos7840_port->led_timer2.data = (unsigned long)mos7840_port;
/* Turn off LED */
mos7840_set_led_sync(port, MODEM_CONTROL_REGISTER, 0x0300);