diff options
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r-- | drivers/scsi/sd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index be535d4215c4..c7839f6c35cc 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -1508,9 +1508,8 @@ static int sd_sync_cache(struct scsi_disk *sdkp) | |||
1508 | * Leave the rest of the command zero to indicate | 1508 | * Leave the rest of the command zero to indicate |
1509 | * flush everything. | 1509 | * flush everything. |
1510 | */ | 1510 | */ |
1511 | res = scsi_execute_req_flags(sdp, cmd, DMA_NONE, NULL, 0, | 1511 | res = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, &sshdr, |
1512 | &sshdr, timeout, SD_MAX_RETRIES, | 1512 | timeout, SD_MAX_RETRIES, 0, RQF_PM, NULL); |
1513 | NULL, 0, RQF_PM); | ||
1514 | if (res == 0) | 1513 | if (res == 0) |
1515 | break; | 1514 | break; |
1516 | } | 1515 | } |
@@ -3296,8 +3295,8 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start) | |||
3296 | if (!scsi_device_online(sdp)) | 3295 | if (!scsi_device_online(sdp)) |
3297 | return -ENODEV; | 3296 | return -ENODEV; |
3298 | 3297 | ||
3299 | res = scsi_execute_req_flags(sdp, cmd, DMA_NONE, NULL, 0, &sshdr, | 3298 | res = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, &sshdr, |
3300 | SD_TIMEOUT, SD_MAX_RETRIES, NULL, 0, RQF_PM); | 3299 | SD_TIMEOUT, SD_MAX_RETRIES, 0, RQF_PM, NULL); |
3301 | if (res) { | 3300 | if (res) { |
3302 | sd_print_result(sdkp, "Start/Stop Unit failed", res); | 3301 | sd_print_result(sdkp, "Start/Stop Unit failed", res); |
3303 | if (driver_byte(res) & DRIVER_SENSE) | 3302 | if (driver_byte(res) & DRIVER_SENSE) |