Skip to content

Commit e91b1db

Browse files
cooldavidgregkh
authored andcommitted
jme: Fix device PM wakeup API usage
commit 81422e672f8181d7ad1ee6c60c723aac649f538f upstream. According to Documentation/power/devices.txt The driver should not use device_set_wakeup_enable() which is the policy for user to decide. Using device_init_wakeup() to initialize dev->power.should_wakeup and dev->power.can_wakeup on driver initialization. And use device_may_wakeup() on suspend to decide if WoL function should be enabled on NIC. Reported-by: Diego Viola <diego.viola@gmail.com> Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1b06e99 commit e91b1db

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

  • drivers/net/ethernet

drivers/net/ethernet/jme.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,7 +1931,7 @@ jme_wait_link(struct jme_adapter *jme)
19311931
static void
19321932
jme_powersave_phy(struct jme_adapter *jme)
19331933
{
1934-
if (jme->reg_pmcs) {
1934+
if (jme->reg_pmcs && device_may_wakeup(&jme->pdev->dev)) {
19351935
jme_set_100m_half(jme);
19361936
if (jme->reg_pmcs & (PMCS_LFEN | PMCS_LREN))
19371937
jme_wait_link(jme);
@@ -2652,8 +2652,6 @@ jme_set_wol(struct net_device *netdev,
26522652
if (wol->wolopts & WAKE_MAGIC)
26532653
jme->reg_pmcs |= PMCS_MFEN;
26542654

2655-
device_set_wakeup_enable(&jme->pdev->dev, !!(jme->reg_pmcs));
2656-
26572655
return 0;
26582656
}
26592657

@@ -3178,7 +3176,7 @@ jme_init_one(struct pci_dev *pdev,
31783176
jme->mii_if.mdio_write = jme_mdio_write;
31793177

31803178
jme_clear_pm_disable_wol(jme);
3181-
device_set_wakeup_enable(&pdev->dev, true);
3179+
device_init_wakeup(&pdev->dev, true);
31823180

31833181
jme_set_phyfifo_5level(jme);
31843182
jme->pcirev = pdev->revision;

0 commit comments

Comments
 (0)