diff options
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r-- | drivers/scsi/scsi_lib.c | 9 |
1 files changed, 4 insertions, 5 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() |