diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/scsi_lib.c | 9 | ||||
-rw-r--r-- | drivers/scsi/sd.c | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index c31187d79343..86d522004a20 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -276,11 +276,10 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, | |||
276 | } | 276 | } |
277 | EXPORT_SYMBOL(scsi_execute); | 277 | EXPORT_SYMBOL(scsi_execute); |
278 | 278 | ||
279 | 279 | int scsi_execute_req_flags(struct scsi_device *sdev, const unsigned char *cmd, | |
280 | int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd, | ||
281 | int data_direction, void *buffer, unsigned bufflen, | 280 | int data_direction, void *buffer, unsigned bufflen, |
282 | struct scsi_sense_hdr *sshdr, int timeout, int retries, | 281 | struct scsi_sense_hdr *sshdr, int timeout, int retries, |
283 | int *resid) | 282 | int *resid, int flags) |
284 | { | 283 | { |
285 | char *sense = NULL; | 284 | char *sense = NULL; |
286 | int result; | 285 | int result; |
@@ -291,14 +290,14 @@ int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd, | |||
291 | return DRIVER_ERROR << 24; | 290 | return DRIVER_ERROR << 24; |
292 | } | 291 | } |
293 | result = scsi_execute(sdev, cmd, data_direction, buffer, bufflen, | 292 | result = scsi_execute(sdev, cmd, data_direction, buffer, bufflen, |
294 | sense, timeout, retries, 0, resid); | 293 | sense, timeout, retries, flags, resid); |
295 | if (sshdr) | 294 | if (sshdr) |
296 | scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, sshdr); | 295 | scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, sshdr); |
297 | 296 | ||
298 | kfree(sense); | 297 | kfree(sense); |
299 | return result; | 298 | return result; |
300 | } | 299 | } |
301 | EXPORT_SYMBOL(scsi_execute_req); | 300 | EXPORT_SYMBOL(scsi_execute_req_flags); |
302 | 301 | ||
303 | /* | 302 | /* |
304 | * Function: scsi_init_cmd_errh() | 303 | * Function: scsi_init_cmd_errh() |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 7992635d405f..c6e2b34a1036 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -1424,8 +1424,9 @@ static int sd_sync_cache(struct scsi_disk *sdkp) | |||
1424 | * Leave the rest of the command zero to indicate | 1424 | * Leave the rest of the command zero to indicate |
1425 | * flush everything. | 1425 | * flush everything. |
1426 | */ | 1426 | */ |
1427 | res = scsi_execute_req(sdp, cmd, DMA_NONE, NULL, 0, &sshdr, | 1427 | res = scsi_execute_req_flags(sdp, cmd, DMA_NONE, NULL, 0, |
1428 | SD_FLUSH_TIMEOUT, SD_MAX_RETRIES, NULL); | 1428 | &sshdr, SD_FLUSH_TIMEOUT, |
1429 | SD_MAX_RETRIES, NULL, REQ_PM); | ||
1429 | if (res == 0) | 1430 | if (res == 0) |
1430 | break; | 1431 | break; |
1431 | } | 1432 | } |
@@ -3021,8 +3022,8 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start) | |||
3021 | if (!scsi_device_online(sdp)) | 3022 | if (!scsi_device_online(sdp)) |
3022 | return -ENODEV; | 3023 | return -ENODEV; |
3023 | 3024 | ||
3024 | res = scsi_execute_req(sdp, cmd, DMA_NONE, NULL, 0, &sshdr, | 3025 | res = scsi_execute_req_flags(sdp, cmd, DMA_NONE, NULL, 0, &sshdr, |
3025 | SD_TIMEOUT, SD_MAX_RETRIES, NULL); | 3026 | SD_TIMEOUT, SD_MAX_RETRIES, NULL, REQ_PM); |
3026 | if (res) { | 3027 | if (res) { |
3027 | sd_printk(KERN_WARNING, sdkp, "START_STOP FAILED\n"); | 3028 | sd_printk(KERN_WARNING, sdkp, "START_STOP FAILED\n"); |
3028 | sd_print_result(sdkp, res); | 3029 | sd_print_result(sdkp, res); |