This is a note to let you know that I've just added the patch titled
ath5k: fix incorrect use of drvdata in PCI suspend/resume code
to the 2.6.39-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:
ath5k-fix-incorrect-use-of-drvdata-in-pci-suspend-resume.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 37000b305bff81bb1ee2f7f37b1319b670a08f76 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <[email protected]>
Date: Wed, 29 Jun 2011 15:39:43 -0400
Subject: ath5k: fix incorrect use of drvdata in PCI suspend/resume code
From: Pavel Roskin <[email protected]>
commit 37000b305bff81bb1ee2f7f37b1319b670a08f76 upstream.
Signed-off-by: Pavel Roskin <[email protected]>
Signed-off-by: John W. Linville <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/net/wireless/ath/ath5k/pci.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- a/drivers/net/wireless/ath/ath5k/pci.c
+++ b/drivers/net/wireless/ath/ath5k/pci.c
@@ -265,7 +265,9 @@ ath5k_pci_remove(struct pci_dev *pdev)
#ifdef CONFIG_PM_SLEEP
static int ath5k_pci_suspend(struct device *dev)
{
- struct ath5k_softc *sc = pci_get_drvdata(to_pci_dev(dev));
+ struct pci_dev *pdev = to_pci_dev(dev);
+ struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+ struct ath5k_softc *sc = hw->priv;
ath5k_led_off(sc);
return 0;
@@ -274,7 +276,8 @@ static int ath5k_pci_suspend(struct devi
static int ath5k_pci_resume(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
- struct ath5k_softc *sc = pci_get_drvdata(pdev);
+ struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+ struct ath5k_softc *sc = hw->priv;
/*
* Suspend/Resume resets the PCI configuration space, so we have to
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.39/ath5k-fix-incorrect-use-of-drvdata-in-sysfs-code.patch
queue-2.6.39/ath5k-fix-incorrect-use-of-drvdata-in-pci-suspend-resume.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
