This is a note to let you know that I've just added the patch titled
sis900: fix sis900_set_mode call parameters.
to the 3.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sis900-fix-sis900_set_mode-call-parameters.patch
and it can be found in the queue-3.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 7a90119352331eeb36ee60415b3c55311e4a92a8 Mon Sep 17 00:00:00 2001
From: Francois Romieu <[email protected]>
Date: Sun, 18 Nov 2012 23:41:50 +0100
Subject: sis900: fix sis900_set_mode call parameters.
From: Francois Romieu <[email protected]>
[ Upstream commit 8495c0da20bc496ac9d5da2b292adb28f61d2713 ]
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]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/net/ethernet/sis/sis900.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- 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
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);
Patches currently in stable-queue which might be from [email protected] are
queue-3.6/sis900-fix-sis900_set_mode-call-parameters.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
