From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Thu, 8 Oct 2009 14:57:45 +0000 (-0400)
Subject: compat-2.6: fix 11-dev-pm-ops.patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=43c0d17aecec37acccc27b5ca91fe0a357180bc7;p=openwrt%2Fstaging%2Fblogic.git

compat-2.6: fix 11-dev-pm-ops.patch

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---

diff --git a/compat/patches/11-dev-pm-ops.patch b/compat/patches/11-dev-pm-ops.patch
index e01eafc51234..d0085533cde8 100644
--- a/compat/patches/11-dev-pm-ops.patch
+++ b/compat/patches/11-dev-pm-ops.patch
@@ -9,7 +9,7 @@ calls on compat code with only slight modifications.
 
 --- a/drivers/net/wireless/ath/ath5k/base.c	2009-10-07 01:58:19.000000000 -0400
 +++ b/drivers/net/wireless/ath/ath5k/base.c	2009-10-07 02:19:58.000000000 -0400
-@@ -197,6 +197,32 @@
+@@ -197,6 +197,33 @@
  #ifdef CONFIG_PM
  static int		ath5k_pci_suspend(struct device *dev);
  static int		ath5k_pci_resume(struct device *dev);
@@ -19,13 +19,14 @@ calls on compat code with only slight modifications.
 +{
 +	int r;
 +
-+	r = ath5k_pci_suspend(pdev->dev);
++	r = ath5k_pci_suspend(&pdev->dev);
 +	if (r)
 +		return r;
 +
 +	pci_save_state(pdev);
 +	pci_disable_device(pdev);
 +	pci_set_power_state(pdev, PCI_D3hot);
++	return 0;
 +}
 +
 +static int ath5k_pci_resume_compat(struct pci_dev *pdev)
@@ -37,7 +38,7 @@ calls on compat code with only slight modifications.
 +	if (r)
 +		return r;
 +
-+	return ath5k_pci_resume(pdev->dev);
++	return ath5k_pci_resume(&pdev->dev);
 +}
  
  SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume);