diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-12-04 00:24:39 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-29 12:24:24 -0500 |
commit | f4f4e47e4af6b02dd1c425b931c65d0165356e33 (patch) | |
tree | 1bca97ce56703d7a101674cf6bf0d28576cf7201 /drivers/scsi/sr.c | |
parent | a528ab7a324f1dbb3598ae0ecd238ab7dd974294 (diff) |
[SCSI] add residual argument to scsi_execute and scsi_execute_req
scsi_execute() and scsi_execute_req() discard the residual length
information. Some callers need it. This adds residual argument
(optional) to scsi_execute and scsi_execute_req.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/sr.c')
-rw-r--r-- | drivers/scsi/sr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 45b66b98a516..e7fa3caead79 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
@@ -177,7 +177,7 @@ int sr_test_unit_ready(struct scsi_device *sdev, struct scsi_sense_hdr *sshdr) | |||
177 | do { | 177 | do { |
178 | the_result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, | 178 | the_result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, |
179 | 0, sshdr, SR_TIMEOUT, | 179 | 0, sshdr, SR_TIMEOUT, |
180 | retries--); | 180 | retries--, NULL); |
181 | if (scsi_sense_valid(sshdr) && | 181 | if (scsi_sense_valid(sshdr) && |
182 | sshdr->sense_key == UNIT_ATTENTION) | 182 | sshdr->sense_key == UNIT_ATTENTION) |
183 | sdev->changed = 1; | 183 | sdev->changed = 1; |
@@ -681,7 +681,7 @@ static void get_sectorsize(struct scsi_cd *cd) | |||
681 | /* Do the command and wait.. */ | 681 | /* Do the command and wait.. */ |
682 | the_result = scsi_execute_req(cd->device, cmd, DMA_FROM_DEVICE, | 682 | the_result = scsi_execute_req(cd->device, cmd, DMA_FROM_DEVICE, |
683 | buffer, sizeof(buffer), NULL, | 683 | buffer, sizeof(buffer), NULL, |
684 | SR_TIMEOUT, MAX_RETRIES); | 684 | SR_TIMEOUT, MAX_RETRIES, NULL); |
685 | 685 | ||
686 | retries--; | 686 | retries--; |
687 | 687 | ||