Patchwork [net,1/1] sis900: fix sis900_set_mode call parameters.

login
register
mail settings
Submitter fran├žois romieu
Date Nov. 18, 2012, 10:41 p.m.
Message ID <20121118224150.GA6755@electric-eye.fr.zoreil.com>
Download mbox | patch
Permalink /patch/199914/
State Accepted
Delegated to: David Miller
Headers show

Comments

fran├žois romieu - Nov. 18, 2012, 10:41 p.m.
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>
---
 drivers/net/ethernet/sis/sis900.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
David Miller - Nov. 18, 2012, 11:28 p.m.
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sun, 18 Nov 2012 23:41:50 +0100

> 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>

Ouch, applied, thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index fb9f6b3..edf5edb 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);