Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / drivers / usb / storage / freecom.c

diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c
index 88aa59ab756321997d670082cc7c24ef84a6ba74..f5a4e8d6a3b1460274eb551343982f071e16ab0b 100644 (file)
--- a/drivers/usb/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
@@ -132,8 +132,7 @@ freecom_readdata (struct scsi_cmnd *srb, struct us_data *us,
 
        /* Now transfer all of our blocks. */
        US_DEBUGP("Start of read\n");
-       result = usb_stor_bulk_transfer_sg(us, ipipe, srb->request_buffer,
-                       count, srb->use_sg, &srb->resid);
+       result = usb_stor_bulk_srb(us, ipipe, srb);
        US_DEBUGP("freecom_readdata done!\n");
 
        if (result > USB_STOR_XFER_SHORT)
@@ -166,8 +165,7 @@ freecom_writedata (struct scsi_cmnd *srb, struct us_data *us,
 
        /* Now transfer all of our blocks. */
        US_DEBUGP("Start of write\n");
-       result = usb_stor_bulk_transfer_sg(us, opipe, srb->request_buffer,
-                       count, srb->use_sg, &srb->resid);
+       result = usb_stor_bulk_srb(us, opipe, srb);
 
        US_DEBUGP("freecom_writedata done!\n");
        if (result > USB_STOR_XFER_SHORT)
@@ -281,7 +279,7 @@ int freecom_transport(struct scsi_cmnd *srb, struct us_data *us)
         * and such will hang. */
        US_DEBUGP("Device indicates that it has %d bytes available\n",
                        le16_to_cpu (fst->Count));
-       US_DEBUGP("SCSI requested %d\n", srb->request_bufflen);
+       US_DEBUGP("SCSI requested %d\n", scsi_bufflen(srb));
 
        /* Find the length we desire to read. */
        switch (srb->cmnd[0]) {
@@ -292,12 +290,12 @@ int freecom_transport(struct scsi_cmnd *srb, struct us_data *us)
                        length = le16_to_cpu(fst->Count);
                        break;
                default:
-                       length = srb->request_bufflen;
+                       length = scsi_bufflen(srb);
        }
 
        /* verify that this amount is legal */
-       if (length > srb->request_bufflen) {
-               length = srb->request_bufflen;
+       if (length > scsi_bufflen(srb)) {
+               length = scsi_bufflen(srb);
                US_DEBUGP("Truncating request to match buffer length: %d\n", length);
        }