From 47d90e5284e4887dac8742da8ab789c30f9583cd Mon Sep 17 00:00:00 2001 From: Horms Date: Mon, 19 Mar 2007 15:06:44 +0900 Subject: [PATCH] --- yaml --- r: 53655 b: refs/heads/master c: b364fd5081b02fa8a966a29eea2da628913fd4b8 h: refs/heads/master i: 53653: e03b3c6ff1f598b91bb1b2eb4283b40cb3341432 53651: 609e653ffdd0fc33d0bf46357f365fa3a394b3fc 53647: a4e098086bbac0903cbc1ec21da0f069afb58cc3 v: v3 --- [refs] | 2 +- trunk/drivers/message/fusion/mptbase.c | 5 ++++- trunk/drivers/message/fusion/mptscsih.c | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b690d5bd6d6e..26b2f6662e1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1f9ce056a1875b6c8633f370df4fb169b925b16 +refs/heads/master: b364fd5081b02fa8a966a29eea2da628913fd4b8 diff --git a/trunk/drivers/message/fusion/mptbase.c b/trunk/drivers/message/fusion/mptbase.c index 0a2d7db7b634..97471af4309c 100644 --- a/trunk/drivers/message/fusion/mptbase.c +++ b/trunk/drivers/message/fusion/mptbase.c @@ -1531,6 +1531,7 @@ mpt_resume(struct pci_dev *pdev) MPT_ADAPTER *ioc = pci_get_drvdata(pdev); u32 device_state = pdev->current_state; int recovery_state; + int err; printk(MYIOC_s_INFO_FMT "pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n", @@ -1538,7 +1539,9 @@ mpt_resume(struct pci_dev *pdev) pci_set_power_state(pdev, 0); pci_restore_state(pdev); - pci_enable_device(pdev); + err = pci_enable_device(pdev); + if (err) + return err; /* enable interrupts */ CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM); diff --git a/trunk/drivers/message/fusion/mptscsih.c b/trunk/drivers/message/fusion/mptscsih.c index 10927e34c2b4..537fcc221c9d 100644 --- a/trunk/drivers/message/fusion/mptscsih.c +++ b/trunk/drivers/message/fusion/mptscsih.c @@ -1188,8 +1188,7 @@ mptscsih_suspend(struct pci_dev *pdev, pm_message_t state) int mptscsih_resume(struct pci_dev *pdev) { - mpt_resume(pdev); - return 0; + return mpt_resume(pdev); } #endif