redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

USB-serial updates for v4.2-rc1

Browse source 
Just a minor clean up of mos7840 this time.
 
 Signed-off-by: Johan Hovold <johan@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJVcaM/AAoJEEEN5E/e4bSVD90P/13PkOIMEa5qOlX4p4IX8nH8
 3xU/I6RrU95OMP5AJFktgB9cKD1WCnse8Q1AYXnGvUi2XkSzXt+j3t+Dj4prcn2E
 2tb0S87uvnW2h0aaaGiVZBywVpeDxNOppzuP5DDxhsu83CDm2Wmgly6DjhSgvEP5
 537BWL9mMk854NCTYZj1NGM1+JrSSJorik/Tzl52UOc7iCsba7y84gv6/uQoQcMw
 K0c/BVFc9/LaLtOOSuJUkucIG9m3Xua/L2IeIyKplG/e4xQBT13qjxwO3zVunxdK
 LdOMlnU2aWFWE0v72GZk7xBdtrTUT8Kx17uHxNC4jgErDcaY5ZWQElCTd3Oce47z
 jV+5khHWAyJYqJpIewt9a9xX1z1V/DJtvhwFQ4voqSpj8AG7oc32qlyhK9oTfGlm
 cEOVneAxerJd3CcXzccRO2HBXJeI1i6I21um3oGoPn4eaoEeXOf1TMSjDQApZkVR
 uRENwCrwdTR+4xRcmPWtFgk3p4WiEsz4GLruWcXyTDsvXTLLr7j0w4Mkk1QaSJkg
 hGjG7JpYEF7/47qM2SUCcyFtcUmvjeCSVFgdRwe4Eccep+qbc1SaoK3axBcUTTNy
 WjkkNkB9v6x47emneTK2Mn/KFxHQ3lXvwPuqk9fkFRj5WJxpRiCJHHiFOLzA747r
 tFJJc0MpaySuBmyXYa/C
 =viIT
 -----END PGP SIGNATURE-----

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>
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
Show stats 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);