Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-alx/patches-2.6.27-r3/0137-2.6.27.38-all-fixes.patch

    Contents of /trunk/kernel26-alx/patches-2.6.27-r3/0137-2.6.27.38-all-fixes.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1176 - (show annotations) (download)
    Thu Oct 14 15:11:06 2010 UTC (13 years, 6 months ago) by niro
    File size: 2059 byte(s) 
    -2.6.27-alx-r3: new magellan 0.5.2 kernel
    1 diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
    2 index ee6be59..5f76f55 100644
    3 --- a/drivers/scsi/scsi.c
    4 +++ b/drivers/scsi/scsi.c
    5 @@ -243,10 +243,7 @@ scsi_host_alloc_command(struct Scsi_Host *shost, gfp_t gfp_mask)
    6 */
    7 struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
    8 {
    9 - struct scsi_cmnd *cmd;
    10 - unsigned char *buf;
    11 -
    12 - cmd = scsi_host_alloc_command(shost, gfp_mask);
    13 + struct scsi_cmnd *cmd = scsi_host_alloc_command(shost, gfp_mask);
    14
    15 if (unlikely(!cmd)) {
    16 unsigned long flags;
    17 @@ -260,9 +257,15 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
    18 spin_unlock_irqrestore(&shost->free_list_lock, flags);
    19
    20 if (cmd) {
    21 + void *buf, *prot;
    22 +
    23 buf = cmd->sense_buffer;
    24 + prot = cmd->prot_sdb;
    25 +
    26 memset(cmd, 0, sizeof(*cmd));
    27 +
    28 cmd->sense_buffer = buf;
    29 + cmd->prot_sdb = prot;
    30 }
    31 }
    32
    33 diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
    34 index 240aad1..657fc25 100644
    35 --- a/drivers/usb/serial/digi_acceleport.c
    36 +++ b/drivers/usb/serial/digi_acceleport.c
    37 @@ -892,16 +892,16 @@ static void digi_rx_unthrottle(struct tty_struct *tty)
    38
    39 spin_lock_irqsave(&priv->dp_port_lock, flags);
    40
    41 - /* turn throttle off */
    42 - priv->dp_throttled = 0;
    43 - priv->dp_throttle_restart = 0;
    44 -
    45 /* restart read chain */
    46 if (priv->dp_throttle_restart) {
    47 port->read_urb->dev = port->serial->dev;
    48 ret = usb_submit_urb(port->read_urb, GFP_ATOMIC);
    49 }
    50
    51 + /* turn throttle off */
    52 + priv->dp_throttled = 0;
    53 + priv->dp_throttle_restart = 0;
    54 +
    55 spin_unlock_irqrestore(&priv->dp_port_lock, flags);
    56
    57 if (ret)
    58 diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
    59 index 9fcc272..579796a 100644
    60 --- a/drivers/usb/serial/usb-serial.c
    61 +++ b/drivers/usb/serial/usb-serial.c
    62 @@ -973,6 +973,7 @@ int usb_serial_probe(struct usb_interface *interface,
    63 if (retval > 0) {
    64 /* quietly accept this device, but don't bind to a
    65 serial port as it's about to disappear */
    66 + serial->num_ports = 0;
    67 goto exit;
    68 }
    69 }