summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/600-p54usb_without_pm_support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-05-01 13:43:12 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-05-01 13:43:12 +0000
commit4fca4229cde716d312bee5bb4bbba425c4dbb8d0 (patch)
tree3648ff331900b092e17cb5e346f55560f383cd2b /package/mac80211/patches/600-p54usb_without_pm_support.patch
parent35fd7d6d20706f62d8be6fe2e846049c1803d867 (diff)
downloadmaster-31e0f0ae-4fca4229cde716d312bee5bb4bbba425c4dbb8d0.tar.gz
master-31e0f0ae-4fca4229cde716d312bee5bb4bbba425c4dbb8d0.tar.bz2
master-31e0f0ae-4fca4229cde716d312bee5bb4bbba425c4dbb8d0.zip
Update to compat-wireless-2009-05-01
SVN-Revision: 15536
Diffstat (limited to 'package/mac80211/patches/600-p54usb_without_pm_support.patch')
-rw-r--r--package/mac80211/patches/600-p54usb_without_pm_support.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/package/mac80211/patches/600-p54usb_without_pm_support.patch b/package/mac80211/patches/600-p54usb_without_pm_support.patch
new file mode 100644
index 0000000000..9fa8915c4f
--- /dev/null
+++ b/package/mac80211/patches/600-p54usb_without_pm_support.patch
@@ -0,0 +1,16 @@
+Fixes compile error when CONFIG_PM=n is set
+
+--- a/drivers/net/wireless/p54/p54usb.c
++++ b/drivers/net/wireless/p54/p54usb.c
+@@ -919,9 +919,11 @@ static int __devinit p54u_probe(struct u
+ priv->common.open = p54u_open;
+ priv->common.stop = p54u_stop;
+ if (recognized_pipes < P54U_PIPE_NUMBER) {
++#ifdef CONFIG_PM
+ /* ISL3887 needs a full reset on resume */
+ udev->reset_resume = 1;
+ err = p54u_device_reset(dev);
++#endif
+
+ priv->hw_type = P54U_3887;
+ dev->extra_tx_headroom += sizeof(struct lm87_tx_hdr);