diff options
| author | Rafael J. Wysocki <[email protected]> | 2015-10-09 20:13:30 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2015-10-09 20:13:30 +0000 |
| commit | 670aee3fc7ac37ae947f8b582d87b51d5fa36524 (patch) | |
| tree | 9885998483d4506208e5aef9c13c8a86adea20bb /drivers/scsi/scsi_lib.c | |
| parent | Merge tag 'pull_req_4.3_rc4' of https://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | cpufreq: prevent lockup on reading scaling_available_frequencies (diff) | |
| download | kernel-670aee3fc7ac37ae947f8b582d87b51d5fa36524.tar.gz kernel-670aee3fc7ac37ae947f8b582d87b51d5fa36524.zip | |
Merge branches 'pm-devfreq' and 'pm-cpufreq'
* pm-devfreq:
PM / devfreq: fix double kfree
PM / devfreq: Fix governor_store()
* pm-cpufreq:
cpufreq: prevent lockup on reading scaling_available_frequencies
cpufreq: acpi_cpufreq: prevent crash on reading freqdomain_cpus
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index cbfc5990052b..126a48c6431e 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1957,7 +1957,7 @@ static int scsi_mq_prep_fn(struct request *req) static void scsi_mq_done(struct scsi_cmnd *cmd) { trace_scsi_dispatch_cmd_done(cmd); - blk_mq_complete_request(cmd->request); + blk_mq_complete_request(cmd->request, cmd->request->errors); } static int scsi_queue_rq(struct blk_mq_hw_ctx *hctx, |