diff options
| author | James Bottomley <JBottomley@Odin.com> | 2015-11-12 07:06:18 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-11-12 07:06:18 -0500 |
| commit | febdfbd2137a5727f70dfbf920105c07e6c2a21e (patch) | |
| tree | 9483a5493ad3e08626e1f53ded594f88a6f4e710 /drivers/scsi/aic94xx | |
| parent | 0da39687a15403251bdfd1c6fb18025c0607326b (diff) | |
| parent | 2c5d16d6a9e7218e57b716e4fd9d77c776d21471 (diff) | |
| download | linux-febdfbd2137a5727f70dfbf920105c07e6c2a21e.tar.gz linux-febdfbd2137a5727f70dfbf920105c07e6c2a21e.tar.bz2 linux-febdfbd2137a5727f70dfbf920105c07e6c2a21e.zip | |
Merge tag '4.4-scsi-mkp' into misc
SCSI queue for 4.4.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/aic94xx')
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index cd094bf82a77..662b2321d1b0 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c @@ -703,10 +703,10 @@ static int asd_unregister_sas_ha(struct asd_ha_struct *asd_ha) { int err; + scsi_remove_host(asd_ha->sas_ha.core.shost); err = sas_unregister_ha(&asd_ha->sas_ha); sas_remove_host(asd_ha->sas_ha.core.shost); - scsi_remove_host(asd_ha->sas_ha.core.shost); scsi_host_put(asd_ha->sas_ha.core.shost); kfree(asd_ha->sas_ha.sas_phy); |