projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3587b1b
)
sis900: fix sis900_set_mode call parameters.
author
Francois Romieu
<
[email protected]
>
Sun, 18 Nov 2012 22:41:50 +0000
(23:41 +0100)
committer
David S. Miller
<
[email protected]
>
Sun, 18 Nov 2012 23:28:15 +0000
(18:28 -0500)
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 <
[email protected]
>
Tested-by: Jan Janssen <
[email protected]
>
Cc: Daniele Venzano <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/sis/sis900.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/sis/sis900.c
b/drivers/net/ethernet/sis/sis900.c
index fb9f6b38511f97beddbff380c2ae7d31878e4ff4..edf5edb13140fb5908f0197298d17cf3b1cb7503 100644
(file)
--- 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);