aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2012-11-18 23:41:50 +0100
committerDavid S. Miller <davem@davemloft.net>2012-11-18 18:28:15 -0500
commit8495c0da20bc496ac9d5da2b292adb28f61d2713 (patch)
treeec7d3ca4f97dd29ff70046ef39955dbd7fc3ab9c /drivers/net/ethernet
parentfanotify: fix FAN_Q_OVERFLOW case of fanotify_read() (diff)
downloadlinux-dev-8495c0da20bc496ac9d5da2b292adb28f61d2713.tar.xz
linux-dev-8495c0da20bc496ac9d5da2b292adb28f61d2713.zip
sis900: fix sis900_set_mode call parameters.
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@fr.zoreil.com> Tested-by: Jan Janssen <medhefgo@web.de> Cc: Daniele Venzano <venza@brownhat.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/sis/sis900.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index fb9f6b38511f..edf5edb13140 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -2479,7 +2479,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);