lkml.org 
[lkml]   [2022]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] sfc/siena: fix driver suspend/resume methods
Date
Fix the missing pci_disable_device() before return
from efx_pm_resume() in the error handling case.

Meanwhile, drivers should do this:
.resume()
pci_enable_device()
.suspend()
pci_disable_device()

Signed-off-by: Peng Wu <wupeng58@huawei.com>
---
drivers/net/ethernet/sfc/siena/efx.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/sfc/siena/efx.c b/drivers/net/ethernet/sfc/siena/efx.c
index 63d999e63960..4c0ab91914f2 100644
--- a/drivers/net/ethernet/sfc/siena/efx.c
+++ b/drivers/net/ethernet/sfc/siena/efx.c
@@ -1216,21 +1216,26 @@ static int efx_pm_resume(struct device *dev)
pci_set_master(efx->pci_dev);
rc = efx->type->reset(efx, RESET_TYPE_ALL);
if (rc)
- return rc;
+ goto out;
down_write(&efx->filter_sem);
rc = efx->type->init(efx);
up_write(&efx->filter_sem);
if (rc)
- return rc;
+ goto out;
rc = efx_pm_thaw(dev);
return rc;
+out:
+ pci_disable_device(pci_dev);
+ return rc;
}

static int efx_pm_suspend(struct device *dev)
{
+ struct pci_dev *pci_dev = to_pci_dev(dev);
int rc;

efx_pm_freeze(dev);
+ pci_disable_device(pci_dev);
rc = efx_pm_poweroff(dev);
if (rc)
efx_pm_resume(dev);
--
2.17.1
\
 
 \ /
  Last update: 2022-05-17 03:29    [W:0.043 / U:0.688 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site