tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Johan Hovold <johan@kernel.org>

Greg Kroah-Hartman 4e47dcf7 b3d424e3

+4 -7
+4 -7
drivers/usb/serial/mos7840.c
··· 2301 2301 goto error; 2302 2302 } 2303 2303 2304 - init_timer(&mos7840_port->led_timer1); 2305 - mos7840_port->led_timer1.function = mos7840_led_off; 2304 + setup_timer(&mos7840_port->led_timer1, mos7840_led_off, 2305 + (unsigned long)mos7840_port); 2306 2306 mos7840_port->led_timer1.expires = 2307 2307 jiffies + msecs_to_jiffies(LED_ON_MS); 2308 - mos7840_port->led_timer1.data = (unsigned long)mos7840_port; 2309 - 2310 - init_timer(&mos7840_port->led_timer2); 2311 - mos7840_port->led_timer2.function = mos7840_led_flag_off; 2308 + setup_timer(&mos7840_port->led_timer2, mos7840_led_flag_off, 2309 + (unsigned long)mos7840_port); 2312 2310 mos7840_port->led_timer2.expires = 2313 2311 jiffies + msecs_to_jiffies(LED_OFF_MS); 2314 - mos7840_port->led_timer2.data = (unsigned long)mos7840_port; 2315 2312 2316 2313 /* Turn off LED */ 2317 2314 mos7840_set_led_sync(port, MODEM_CONTROL_REGISTER, 0x0300);