[PATCH 143/222] sis900: fix sis900_set_mode call parameters.
Herton Ronaldo Krzesinski
herton.krzesinski at canonical.com
Wed Jan 16 15:55:43 UTC 2013
3.5.7.3 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Francois Romieu <romieu at fr.zoreil.com>
commit 8495c0da20bc496ac9d5da2b292adb28f61d2713 upstream.
Leftover of 57d6d456cfb89264f87d24f52640ede23fdf12bd ("sis900: stop
using net_device.{base_addr, irq} and convert to __iomem.").
It is needed for suspend / resume to work.
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
Tested-by: Jan Janssen <medhefgo at web.de>
Cc: Daniele Venzano <venza at brownhat.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski at canonical.com>
---
drivers/net/ethernet/sis/sis900.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 203d9c6..f21e30c 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -2477,7 +2477,7 @@ static int sis900_resume(struct pci_dev *pci_dev)
netif_start_queue(net_dev);
/* Workaround for EDB */
- sis900_set_mode(ioaddr, HW_SPEED_10_MBPS, FDX_CAPABLE_HALF_SELECTED);
+ sis900_set_mode(sis_priv, HW_SPEED_10_MBPS, FDX_CAPABLE_HALF_SELECTED);
/* Enable all known interrupts by setting the interrupt mask. */
sw32(imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE);
--
1.7.9.5
More information about the kernel-team
mailing list