These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rts5208 / rtsx_scsi.c

diff --git a/kernel/drivers/staging/rts5208/rtsx_scsi.c b/kernel/drivers/staging/rts5208/rtsx_scsi.c
index 8a5d6a8..60871f3 100644 (file)
--- a/kernel/drivers/staging/rts5208/rtsx_scsi.c
+++ b/kernel/drivers/staging/rts5208/rtsx_scsi.c
@@ -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) {