diff options
Diffstat (limited to 'drivers/message')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 5 | ||||
-rw-r--r-- | drivers/message/fusion/mptscsih.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 0a2d7db7b634..97471af4309c 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -1531,6 +1531,7 @@ mpt_resume(struct pci_dev *pdev) | |||
1531 | MPT_ADAPTER *ioc = pci_get_drvdata(pdev); | 1531 | MPT_ADAPTER *ioc = pci_get_drvdata(pdev); |
1532 | u32 device_state = pdev->current_state; | 1532 | u32 device_state = pdev->current_state; |
1533 | int recovery_state; | 1533 | int recovery_state; |
1534 | int err; | ||
1534 | 1535 | ||
1535 | printk(MYIOC_s_INFO_FMT | 1536 | printk(MYIOC_s_INFO_FMT |
1536 | "pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n", | 1537 | "pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n", |
@@ -1538,7 +1539,9 @@ mpt_resume(struct pci_dev *pdev) | |||
1538 | 1539 | ||
1539 | pci_set_power_state(pdev, 0); | 1540 | pci_set_power_state(pdev, 0); |
1540 | pci_restore_state(pdev); | 1541 | pci_restore_state(pdev); |
1541 | pci_enable_device(pdev); | 1542 | err = pci_enable_device(pdev); |
1543 | if (err) | ||
1544 | return err; | ||
1542 | 1545 | ||
1543 | /* enable interrupts */ | 1546 | /* enable interrupts */ |
1544 | CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM); | 1547 | CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM); |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 10927e34c2b4..537fcc221c9d 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
@@ -1188,8 +1188,7 @@ mptscsih_suspend(struct pci_dev *pdev, pm_message_t state) | |||
1188 | int | 1188 | int |
1189 | mptscsih_resume(struct pci_dev *pdev) | 1189 | mptscsih_resume(struct pci_dev *pdev) |
1190 | { | 1190 | { |
1191 | mpt_resume(pdev); | 1191 | return mpt_resume(pdev); |
1192 | return 0; | ||
1193 | } | 1192 | } |
1194 | 1193 | ||
1195 | #endif | 1194 | #endif |