diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-05 16:54:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-05 16:54:34 +0300 |
| commit | 4e47dcf78d2fa0b6316b6d563a055fdcc93bd222 (patch) | |
| tree | c422c90ea04b9cfc09acdca8b1db3bb76ec85ecb | |
| parent | b3d424e3dcbb5eba572baae30e1052b2fff7b51e (diff) | |
| parent | f05b7cb6f2beed0869669cc4748341560eba2aef (diff) | |
| download | linux-4e47dcf78d2fa0b6316b6d563a055fdcc93bd222.tar.xz | |
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>
| -rw-r--r-- | drivers/usb/serial/mos7840.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index e4473a9109cf..8ac9b55f05af 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -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); |