lkml.org 
[lkml]   [2012]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 089/105] USB: mos7840: remove invalid disconnect handling
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <jhovold@gmail.com>

    commit e681b66f2e19fadbe8a7e2a17900978cb6bc921f upstream.

    Remove private zombie flag used to signal disconnect and to prevent
    control urb from being submitted from interrupt urb completion handler.

    The control urb will not be re-submitted as both the control urb and the
    interrupt urb is killed on disconnect.

    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/serial/mos7840.c | 13 +------------
    1 file changed, 1 insertion(+), 12 deletions(-)

    --- a/drivers/usb/serial/mos7840.c
    +++ b/drivers/usb/serial/mos7840.c
    @@ -239,7 +239,6 @@ struct moschip_port {
    __u8 shadowMCR; /* last MCR value received */
    char open;
    char open_ports;
    - char zombie;
    wait_queue_head_t wait_chase; /* for handling sleeping while waiting for chase to finish */
    wait_queue_head_t delta_msr_wait; /* for handling sleeping while waiting for msr change to happen */
    int delta_msr_cond;
    @@ -642,14 +641,7 @@ static void mos7840_interrupt_callback(s
    wreg = MODEM_STATUS_REGISTER;
    break;
    }
    - spin_lock(&mos7840_port->pool_lock);
    - if (!mos7840_port->zombie) {
    - rv = mos7840_get_reg(mos7840_port, wval, wreg, &Data);
    - } else {
    - spin_unlock(&mos7840_port->pool_lock);
    - return;
    - }
    - spin_unlock(&mos7840_port->pool_lock);
    + rv = mos7840_get_reg(mos7840_port, wval, wreg, &Data);
    }
    }
    }
    @@ -2611,9 +2603,6 @@ static void mos7840_disconnect(struct us
    mos7840_port = mos7840_get_port_private(serial->port[i]);
    dbg ("mos7840_port %d = %p", i, mos7840_port);
    if (mos7840_port) {
    - spin_lock_irqsave(&mos7840_port->pool_lock, flags);
    - mos7840_port->zombie = 1;
    - spin_unlock_irqrestore(&mos7840_port->pool_lock, flags);
    usb_kill_urb(mos7840_port->control_urb);
    }
    }



    \
     
     \ /
      Last update: 2012-10-29 01:41    [W:3.139 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site