vserver 1.9.5.x5

[linux-2.6.git] / drivers / usb / storage / transport.c

diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 42f7843..ddc1e3b 100644 (file)
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -537,7 +537,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
        /* if the command gets aborted by the higher layers, we need to
         * short-circuit all other processing
         */
-       if (us->sm_state == US_STATE_ABORTING) {
+       if (test_bit(US_FLIDX_TIMED_OUT, &us->flags)) {
                US_DEBUGP("-- command was aborted\n");
                goto Handle_Abort;
        }
@@ -665,7 +665,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
                srb->cmd_len = old_cmd_len;
                memcpy(srb->cmnd, old_cmnd, MAX_COMMAND_SIZE);
 
-               if (us->sm_state == US_STATE_ABORTING) {
+               if (test_bit(US_FLIDX_TIMED_OUT, &us->flags)) {
                        US_DEBUGP("-- auto-sense aborted\n");
                        goto Handle_Abort;
                }
@@ -911,7 +911,6 @@ int usb_stor_Bulk_max_lun(struct us_data *us)
        int result;
 
        /* issue the command */
-       us->iobuf[0] = 0;
        result = usb_stor_control_msg(us, us->recv_ctrl_pipe,
                                 US_BULK_GET_MAX_LUN, 
                                 USB_DIR_IN | USB_TYPE_CLASS | 
@@ -922,7 +921,7 @@ int usb_stor_Bulk_max_lun(struct us_data *us)
                  result, us->iobuf[0]);
 
        /* if we have a successful request, return the result */
-       if (result >= 0)
+       if (result > 0)
                return us->iobuf[0];
 
        /* 
@@ -934,13 +933,16 @@ int usb_stor_Bulk_max_lun(struct us_data *us)
        if (result == -EPIPE) {
                usb_stor_clear_halt(us, us->recv_bulk_pipe);
                usb_stor_clear_halt(us, us->send_bulk_pipe);
-               /* return the default -- no LUNs */
-               return 0;
        }
 
-       /* An answer or a STALL are the only valid responses.  If we get
-        * something else, return an indication of error */
-       return -1;
+       /*
+        * Some devices don't like GetMaxLUN.  They may STALL the control
+        * pipe, they may return a zero-length result, they may do nothing at
+        * all and timeout, or they may fail in even more bizarrely creative
+        * ways.  In these cases the best approach is to use the default
+        * value: only one LUN.
+        */
+       return 0;
 }
 
 int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us)
@@ -952,6 +954,13 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us)
        int result;
        int fake_sense = 0;
        unsigned int cswlen;
+       unsigned int cbwlen = US_BULK_CB_WRAP_LEN;
+
+       /* Take care of BULK32 devices; set extra byte to 0 */
+       if ( unlikely(us->flags & US_FL_BULK32)) {
+               cbwlen = 32;
+               us->iobuf[31] = 0;
+       }
 
        /* set up the command wrapper */
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
@@ -974,7 +983,7 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us)
                        (bcb->Lun >> 4), (bcb->Lun & 0x0F), 
                        bcb->Length);
        result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe,
-                               bcb, US_BULK_CB_WRAP_LEN, NULL);
+                               bcb, cbwlen, NULL);
        US_DEBUGP("Bulk command transfer result=%d\n", result);
        if (result != USB_STOR_XFER_GOOD)
                return USB_STOR_TRANSPORT_ERROR;
@@ -983,9 +992,10 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us)
        /* send/receive data payload, if there is any */
 
        /* Genesys Logic interface chips need a 100us delay between the
-        * command phase and the data phase */
-       if (us->pusb_dev->descriptor.idVendor == USB_VENDOR_ID_GENESYS)
-               udelay(100);
+        * command phase and the data phase.  Some devices need a little
+        * more than that, probably because of clock rate inaccuracies. */
+       if (le16_to_cpu(us->pusb_dev->descriptor.idVendor) == USB_VENDOR_ID_GENESYS)
+               udelay(110);
 
        if (transfer_length) {
                unsigned int pipe = srb->sc_data_direction == DMA_FROM_DEVICE ? 
@@ -1055,8 +1065,13 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us)
 
        /* try to compute the actual residue, based on how much data
         * was really transferred and what the device tells us */
-       residue = min(residue, transfer_length);
-       srb->resid = max(srb->resid, (int) residue);
+       if (residue) {
+               if (!(us->flags & US_FL_IGNORE_RESIDUE) ||
+                               srb->sc_data_direction == DMA_TO_DEVICE) {
+                       residue = min(residue, transfer_length);
+                       srb->resid = max(srb->resid, (int) residue);
+               }
+       }
 
        /* based on the status code, we report good or bad */
        switch (bcs->Status) {