diff options
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_transport.c')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_transport.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c index f29ea5e78bb3..b55c6dc07470 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_transport.c +++ b/drivers/scsi/mpt2sas/mpt2sas_transport.c | |||
@@ -140,7 +140,7 @@ _transport_set_identify(struct MPT2SAS_ADAPTER *ioc, u16 handle, | |||
140 | u32 device_info; | 140 | u32 device_info; |
141 | u32 ioc_status; | 141 | u32 ioc_status; |
142 | 142 | ||
143 | if (ioc->shost_recovery) { | 143 | if (ioc->shost_recovery || ioc->pci_error_recovery) { |
144 | printk(MPT2SAS_INFO_FMT "%s: host reset in progress!\n", | 144 | printk(MPT2SAS_INFO_FMT "%s: host reset in progress!\n", |
145 | __func__, ioc->name); | 145 | __func__, ioc->name); |
146 | return -EFAULT; | 146 | return -EFAULT; |
@@ -302,7 +302,7 @@ _transport_expander_report_manufacture(struct MPT2SAS_ADAPTER *ioc, | |||
302 | u64 *sas_address_le; | 302 | u64 *sas_address_le; |
303 | u16 wait_state_count; | 303 | u16 wait_state_count; |
304 | 304 | ||
305 | if (ioc->shost_recovery) { | 305 | if (ioc->shost_recovery || ioc->pci_error_recovery) { |
306 | printk(MPT2SAS_INFO_FMT "%s: host reset in progress!\n", | 306 | printk(MPT2SAS_INFO_FMT "%s: host reset in progress!\n", |
307 | __func__, ioc->name); | 307 | __func__, ioc->name); |
308 | return -EFAULT; | 308 | return -EFAULT; |
@@ -894,7 +894,7 @@ mpt2sas_transport_update_links(struct MPT2SAS_ADAPTER *ioc, | |||
894 | struct _sas_node *sas_node; | 894 | struct _sas_node *sas_node; |
895 | struct _sas_phy *mpt2sas_phy; | 895 | struct _sas_phy *mpt2sas_phy; |
896 | 896 | ||
897 | if (ioc->shost_recovery) | 897 | if (ioc->shost_recovery || ioc->pci_error_recovery) |
898 | return; | 898 | return; |
899 | 899 | ||
900 | spin_lock_irqsave(&ioc->sas_node_lock, flags); | 900 | spin_lock_irqsave(&ioc->sas_node_lock, flags); |
@@ -997,7 +997,7 @@ _transport_get_expander_phy_error_log(struct MPT2SAS_ADAPTER *ioc, | |||
997 | u64 *sas_address_le; | 997 | u64 *sas_address_le; |
998 | u16 wait_state_count; | 998 | u16 wait_state_count; |
999 | 999 | ||
1000 | if (ioc->shost_recovery) { | 1000 | if (ioc->shost_recovery || ioc->pci_error_recovery) { |
1001 | printk(MPT2SAS_INFO_FMT "%s: host reset in progress!\n", | 1001 | printk(MPT2SAS_INFO_FMT "%s: host reset in progress!\n", |
1002 | __func__, ioc->name); | 1002 | __func__, ioc->name); |
1003 | return -EFAULT; | 1003 | return -EFAULT; |