summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt2009-12-10 21:42:27 +0100
committerDavid S. Miller2009-12-12 00:07:54 +0100
commit5fc3441349936ea6f1f95a1ef17492223c76a695 (patch)
tree3270d67d13f52964d4368344881a5c08be8b7cee
parentsmc91x: fix unused flags warnings on UP systems (diff)
downloadkernel-qcow2-linux-5fc3441349936ea6f1f95a1ef17492223c76a695.tar.gz
kernel-qcow2-linux-5fc3441349936ea6f1f95a1ef17492223c76a695.tar.xz
kernel-qcow2-linux-5fc3441349936ea6f1f95a1ef17492223c76a695.zip
net: smc91x: Fix up type mismatch in smc_drv_resume().
smc_drv_resume() takes a struct device, while smc_enable_device() takes a platform device. This fixes up the smc_enable_device() callsite with the proper pointer. It's not obvious when this change was introduced, as git history doesn't go back that far. Presumably the resume code has always been broken in this fashion. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/smc91x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index b0c92b60c925..ea4fae79d6ec 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2387,7 +2387,7 @@ static int smc_drv_resume(struct device *dev)
if (ndev) {
struct smc_local *lp = netdev_priv(ndev);
- smc_enable_device(dev);
+ smc_enable_device(pdev);
if (netif_running(ndev)) {
smc_reset(ndev);
smc_enable(ndev);