Skip to content

Commit e697b16

Browse files
Ondrej Zarydavem330
authored andcommitted
tlan: Enable device at resume
pci_disable_device() is called in _suspend but there's no corresponding pci_enable_device() in _resume. This causes "disabling already-disabled device" warning on 2nd suspend. Add pci_enable_device() call to _resume to fix this problem. Signed-off-by: Ondrej Zary <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 7a72edd commit e697b16

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/net/ethernet/ti/tlan.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,10 @@ static int tlan_suspend(struct pci_dev *pdev, pm_message_t state)
365365
static int tlan_resume(struct pci_dev *pdev)
366366
{
367367
struct net_device *dev = pci_get_drvdata(pdev);
368+
int rc = pci_enable_device(pdev);
368369

369-
pci_set_power_state(pdev, PCI_D0);
370+
if (rc)
371+
return rc;
370372
pci_restore_state(pdev);
371373
pci_enable_wake(pdev, PCI_D0, 0);
372374
netif_device_attach(dev);

0 commit comments

Comments
 (0)