aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-10 01:54:04 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-11 14:38:43 -0500
commit0303adeee3d6740cd78a71c0f40946b4886ceaa3 (patch)
tree23621734cc21051f27e480a0c6764c250d40a93d
parent43067ed8aecac4410a0a629e504629ebece35206 (diff)
atl1c: Do not call device_init_wakeup() in atl1c_probe()
The atl1c driver shouldn't call device_init_wakeup() in its probe routine with the second argument equal to 1, because for PCI devices the wakeup capability setting is initialized as appropriate by the PCI subsystem. Remove the potentially harmful call. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/atl1c/atl1c_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index 3824382faec..e60595f0247 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -2718,7 +2718,6 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
2718 goto err_reset; 2718 goto err_reset;
2719 } 2719 }
2720 2720
2721 device_init_wakeup(&pdev->dev, 1);
2722 /* reset the controller to 2721 /* reset the controller to
2723 * put the device in a known good starting state */ 2722 * put the device in a known good starting state */
2724 err = atl1c_phy_init(&adapter->hw); 2723 err = atl1c_phy_init(&adapter->hw);