staging: rts5208: fix transfer length 0 for 6-byte r/w commands
authorAkinobu Mita <akinobu.mita@gmail.com>
Sat, 16 May 2015 07:17:51 +0000 (16:17 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 31 May 2015 02:40:14 +0000 (11:40 +0900)
For 6-byte r/w commands, transfer length 0 means 256 blocks of data,
not 0 block.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Micky Ching <micky_ching@realsil.com.cn>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rts5208/rtsx_scsi.c

index 8a5d6a8e780f3a63658083f19f3adb494ec574aa..60871f3022b1c8b4cdf19f8bfe2028ff0c0f9ab1 100644 (file)
@@ -915,6 +915,8 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                start_sec = ((u32)(srb->cmnd[1] & 0x1F) << 16) |
                        ((u32)srb->cmnd[2] << 8) | ((u32)srb->cmnd[3]);
                sec_cnt = srb->cmnd[4];
+               if (sec_cnt == 0)
+                       sec_cnt = 256;
        } else if ((srb->cmnd[0] == VENDOR_CMND) &&
                (srb->cmnd[1] == SCSI_APP_CMD) &&
                ((srb->cmnd[2] == PP_READ10) || (srb->cmnd[2] == PP_WRITE10))) {
@@ -2904,9 +2906,11 @@ void led_shine(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
        if ((srb->cmnd[0] == READ_10) || (srb->cmnd[0] == WRITE_10))
                sec_cnt = ((u16)(srb->cmnd[7]) << 8) | srb->cmnd[8];
-       else if ((srb->cmnd[0] == READ_6) || (srb->cmnd[0] == WRITE_6))
+       else if ((srb->cmnd[0] == READ_6) || (srb->cmnd[0] == WRITE_6)) {
                sec_cnt = srb->cmnd[4];
-       else
+               if (sec_cnt == 0)
+                       sec_cnt = 256;
+       } else
                return;
 
        if (chip->rw_cap[lun] >= GPIO_TOGGLE_THRESHOLD) {