patch usb-serial-straighten-out-serial_open.patch added to 2.6.31-stable tree
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi
Quoted 8 lines · On Friday 02 October 2009, [email protected] wrote:
This is a note to let you know that we have just queued up the patch titled
Subject: usb-serial: straighten out
serial_opento the 2.6.31-stable tree. Its filename is
usb-serial-straighten-out-serial_open.patch
This patch breaks compilation of the current 2.6.31 -stable queue:
[...]
LD [M] drivers/usb/mon/usbmon.o LD drivers/usb/serial/built-in.o CC [M] drivers/usb/serial/usb-serial.o
drivers/usb/serial/usb-serial.c: In function 'serial_open':drivers/usb/serial/usb-serial.c:272: error: 'flip' undeclared (first use in this function) drivers/usb/serial/usb-serial.c:272: error: (Each undeclared identifier is reported only once drivers/usb/serial/usb-serial.c:272: error: for each function it appears in.) make[6]: *** [drivers/usb/serial/usb-serial.o] Error 1
make[5]: *** [drivers/usb/serial] Error 2
make[4]: *** [drivers/usb] Error 2
make[3]: *** [drivers] Error 2
[...]
Quoted 66 lines
From
320348c8d5c9b591282633ddb8959b42f7fc7a1cMon Sep 17 00:00:00 2001
From: Alan Stern <[email protected]>
Date: Tue, 1 Sep 2009 11:39:59 -0400
Subject: usb-serial: straighten outserial_openFrom: Alan Stern <[email protected]>
commit
320348c8d5c9b591282633ddb8959b42f7fc7a1cupstream.This patch (as1291) removes a bunch of code from
serial_open(), things that were rendered unnecessary by earlier patches. A missing spinlock is added to protectport->port.count, which needs to be incremented even if the open fails but not if the tty has gotten a hangup. The test for whether the hardware has been initialized, based on the use count, is replaced by a more transparent test of theASYNCB_INITIALIZEDbit in the port flags.Signed-off-by Alan Stern <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/usb/serial/usb-serial.c | 59 ++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 37 deletions(-)drivers/usb/serial/usb-serial.c +14
-15@@ -245,55 +245,40 @@ static int serial_install(struct tty_drireturn retval; } -static int serial_open (struct tty_struct *tty,struct file *filp) +static int serial_open (struct tty_struct *tty,struct file *filp) { -struct usb_serial *serial; -struct usb_serial_port *port; -int retval =0 ; -int first =0 ; - - port = tty->driver_data; - serial = port->serial; +struct usb_serial_port *port = tty->driver_data; +struct usb_serial *serial = port->serial; +int retval;dbg ("%s - port %d" , __func__, port->number); -if (mutex_lock_interruptible (&port->mutex)) -return -ERESTARTSYS ; - - ++port->port.count; +spin_lock_irq (&port->port.lock); +if (!tty_hung_up_p (filp)) + ++port->port.count; +spin_unlock_irq (&port->port.lock);tty_port_tty_set (&port->port, tty); -/* If the console is attached, the device is already open */ -if (port->port.count ==1 && !port->console) { - first =1 ; +/* Do the device-specific open only if the hardware isn't +* already initialized. +*/ +if (!test_bit (ASYNCB_INITIALIZED , &port->port.flags)) { +if (mutex_lock_interruptible (&port->mutex)) +return -ERESTARTSYS ;mutex_lock (&serial->disc_mutex);
drivers/usb/serial/usb-serial.c static int serial_install(struct tty_dri · line 272
Quoted 10 lines
drivers/usb/serial/usb-serial.c +4
-6- -/* only call the device specific open if this -* is the first time the port is opened */ - retval = serial->type->open (tty, port, filp); -if (retval) - goto bailout_module_put; +if (serial->disconnected) + retval = -ENODEV ; +else + retval = port->serial->type->open (tty, port, flip);
s/flip/filp/
drivers/usb/serial/usb-serial.c static int serial_install(struct tty_dri · line 278
Quoted 6 lines
drivers/usb/serial/usb-serial.c +3
-0mutex_unlock (&serial->disc_mutex); +mutex_unlock (&port->mutex); +if (retval) +return retval;set_bit (ASYNCB_INITIALIZED , &port->port.flags); }
[...]
Regards
Stefan Lippers-Hollmann
Quoted 97 lines · Stefan Lippers-Hollmann
Hi
Quoted 8 lines · On Friday 02 October 2009, [email protected] wrote:
This is a note to let you know that we have just queued up the patch titled
Subject: usb-serial: straighten out
serial_opento the 2.6.31-stable tree. Its filename is
usb-serial-straighten-out-serial_open.patch
This patch breaks compilation of the current 2.6.31 -stable queue:
[...]LD [M] drivers/usb/mon/usbmon.o LD drivers/usb/serial/built-in.o CC [M] drivers/usb/serial/usb-serial.o
drivers/usb/serial/usb-serial.c: In function 'serial_open':drivers/usb/serial/usb-serial.c:272: error: 'flip' undeclared (first use in this function)drivers/usb/serial/usb-serial.c:272: error: (Each undeclared identifier is reported only oncedrivers/usb/serial/usb-serial.c:272: error: for each function it appears in.) make[6]: *** [drivers/usb/serial/usb-serial.o] Error 1
make[5]: *** [drivers/usb/serial] Error 2
make[4]: *** [drivers/usb] Error 2
make[3]: *** [drivers] Error 2
[...]Quoted 70 lines
From
320348c8d5c9b591282633ddb8959b42f7fc7a1cMon Sep 17 00:00:00 2001
From: Alan Stern <[email protected]>
Date: Tue, 1 Sep 2009 11:39:59 -0400
Subject: usb-serial: straighten outserial_openFrom: Alan Stern <[email protected]>
commit
320348c8d5c9b591282633ddb8959b42f7fc7a1cupstream.This patch (as1291) removes a bunch of code from
serial_open(), things that were rendered unnecessary by earlier patches. A missing spinlock is added to protectport->port.count, which needs to be incremented even if the open fails but not if the tty has gotten a hangup. The test for whether the hardware has been initialized, based on the use count, is replaced by a more transparent test of theASYNCB_INITIALIZEDbit in the port flags.Signed-off-by Alan Stern <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/usb/serial/usb-serial.c | 59 ++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 37 deletions(-)drivers/usb/serial/usb-serial.c +14
-19@@ -245,55 +245,40 @@ static int serial_install(struct tty_drireturn retval; } -static int serial_open (struct tty_struct *tty,struct file *filp) +static int serial_open (struct tty_struct *tty,struct file *filp) { -struct usb_serial *serial; -struct usb_serial_port *port; -int retval =0 ; -int first =0 ; - - port = tty->driver_data; - serial = port->serial; +struct usb_serial_port *port = tty->driver_data; +struct usb_serial *serial = port->serial; +int retval;dbg ("%s - port %d" , __func__, port->number); -if (mutex_lock_interruptible (&port->mutex)) -return -ERESTARTSYS ; - - ++port->port.count; +spin_lock_irq (&port->port.lock); +if (!tty_hung_up_p (filp)) + ++port->port.count; +spin_unlock_irq (&port->port.lock);tty_port_tty_set (&port->port, tty); -/* If the console is attached, the device is already open */ -if (port->port.count ==1 && !port->console) { - first =1 ; +/* Do the device-specific open only if the hardware isn't +* already initialized. +*/ +if (!test_bit (ASYNCB_INITIALIZED , &port->port.flags)) { +if (mutex_lock_interruptible (&port->mutex)) +return -ERESTARTSYS ;mutex_lock (&serial->disc_mutex); - -/* only call the device specific open if this -* is the first time the port is opened */ - retval = serial->type->open (tty, port, filp);
Quoted 8 lines
drivers/usb/serial/usb-serial.c static int serial_install(struct tty_dri · line 272
Quoted 6 lines
drivers/usb/serial/usb-serial.c +4
-2-if (retval) - goto bailout_module_put; +if (serial->disconnected) + retval = -ENODEV ; +else + retval = port->serial->type->open (tty, port, flip);s/flip/filp/
Sorry, yes, I made the change already to the queue, odd that the patch that went out was wrong. My fault in the backporting of this.
greg k-h