mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
staging: rts5208: fix transfer length 0 for 6-byte r/w commands
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>
This commit is contained in:
parent
07d783fd83
commit
8ee0df0d06
1 changed files with 6 additions and 2 deletions
|
@ -915,6 +915,8 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)
|
||||||
start_sec = ((u32)(srb->cmnd[1] & 0x1F) << 16) |
|
start_sec = ((u32)(srb->cmnd[1] & 0x1F) << 16) |
|
||||||
((u32)srb->cmnd[2] << 8) | ((u32)srb->cmnd[3]);
|
((u32)srb->cmnd[2] << 8) | ((u32)srb->cmnd[3]);
|
||||||
sec_cnt = srb->cmnd[4];
|
sec_cnt = srb->cmnd[4];
|
||||||
|
if (sec_cnt == 0)
|
||||||
|
sec_cnt = 256;
|
||||||
} else if ((srb->cmnd[0] == VENDOR_CMND) &&
|
} else if ((srb->cmnd[0] == VENDOR_CMND) &&
|
||||||
(srb->cmnd[1] == SCSI_APP_CMD) &&
|
(srb->cmnd[1] == SCSI_APP_CMD) &&
|
||||||
((srb->cmnd[2] == PP_READ10) || (srb->cmnd[2] == PP_WRITE10))) {
|
((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))
|
if ((srb->cmnd[0] == READ_10) || (srb->cmnd[0] == WRITE_10))
|
||||||
sec_cnt = ((u16)(srb->cmnd[7]) << 8) | srb->cmnd[8];
|
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];
|
sec_cnt = srb->cmnd[4];
|
||||||
else
|
if (sec_cnt == 0)
|
||||||
|
sec_cnt = 256;
|
||||||
|
} else
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (chip->rw_cap[lun] >= GPIO_TOGGLE_THRESHOLD) {
|
if (chip->rw_cap[lun] >= GPIO_TOGGLE_THRESHOLD) {
|
||||||
|
|
Loading…
Reference in a new issue