diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:04:37 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:04:37 +0800 |
| commit | 2e2fb031287a5946d97b85769f80ca60f0166e15 (patch) | |
| tree | 327758ae12bc31e290d48d8400c0c440fe7f5cd9 /drivers/scsi/megaraid/megaraid_sas_fusion.c | |
| parent | ab7f86e8cb2a22bc1850316700981b063ab67599 (diff) | |
| parent | cb370744bc101be91a0bc3e9fbdb670ab44df97d (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-17.02-rt
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_fusion.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 5a0800d19970..bd6f71b97710 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -2490,6 +2490,7 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance, printk("megaraid_sas: pending commands remain after waiting, " "will reset adapter scsi%d.\n", instance->host->host_no); + *convert = 1; retval = 1; } out: |