aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/smc91x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/smc91x.c')
-rw-r--r--drivers/net/smc91x.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index ae4983a5127d..ea4fae79d6ec 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -534,9 +534,9 @@ static inline void smc_rcv(struct net_device *dev)
534#define smc_special_lock(lock, flags) spin_lock_irqsave(lock, flags) 534#define smc_special_lock(lock, flags) spin_lock_irqsave(lock, flags)
535#define smc_special_unlock(lock, flags) spin_unlock_irqrestore(lock, flags) 535#define smc_special_unlock(lock, flags) spin_unlock_irqrestore(lock, flags)
536#else 536#else
537#define smc_special_trylock(lock, flags) (1) 537#define smc_special_trylock(lock, flags) (flags == flags)
538#define smc_special_lock(lock, flags) do { } while (0) 538#define smc_special_lock(lock, flags) do { flags = 0; } while (0)
539#define smc_special_unlock(lock, flags) do { } while (0) 539#define smc_special_unlock(lock, flags) do { flags = 0; } while (0)
540#endif 540#endif
541 541
542/* 542/*
@@ -2387,7 +2387,7 @@ static int smc_drv_resume(struct device *dev)
2387 2387
2388 if (ndev) { 2388 if (ndev) {
2389 struct smc_local *lp = netdev_priv(ndev); 2389 struct smc_local *lp = netdev_priv(ndev);
2390 smc_enable_device(dev); 2390 smc_enable_device(pdev);
2391 if (netif_running(ndev)) { 2391 if (netif_running(ndev)) {
2392 smc_reset(ndev); 2392 smc_reset(ndev);
2393 smc_enable(ndev); 2393 smc_enable(ndev);