]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
net: smc91x: Fix up type mismatch in smc_drv_resume().
authorPaul Mundt <lethal@linux-sh.org>
Thu, 10 Dec 2009 20:42:27 +0000 (20:42 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Dec 2009 23:07:54 +0000 (15:07 -0800)
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>
drivers/net/smc91x.c

index b0c92b60c925cb2f99f1a46b19284cf8436c141a..ea4fae79d6ecc38171422c3128d2b6c4657d515c 100644 (file)
@@ -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);