[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.5-16-g206d7f6

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 743a5907c1bf66307f306dd3ebd347b62daf61ad
Author: Damyan Ivanov <dmn at debian.org>
Date:   Fri Jan 15 19:21:00 2010 +0200

    ensure rt2860 is idle before switching down
    
    otherwise it may lock up. buggy buggy staging driver

diff --git a/debian/changelog b/debian/changelog
index 101553f..6da3e0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ eeepc-acpi-scripts (1.1.7) UNRELEASED; urgency=low
   [ Damyan Ivanov ]
   * add a hook in /etc/pm/sleep.d that switches off wlan on suspend on models
     using RT2860
+  * wireless.sh: deconfigure wlan0 and remove the rt2860sta module before
+    switching off the hardware
 
   [ Darren Salt ]
   * rfkill-input isn't present in kernel ≥ 2.6.31, so don't try loading it.
diff --git a/etc/acpi/actions/wireless.sh b/etc/acpi/actions/wireless.sh
index 848c116..a1f5e88 100755
--- a/etc/acpi/actions/wireless.sh
+++ b/etc/acpi/actions/wireless.sh
@@ -28,6 +28,11 @@ case "$cmd" in
 	;;
     off|disable|0)
 	if [ "$STATE" = 1 ]; then
+            # rt2860 needs to be idle when shut down
+            if lsmod | grep -q rt2860sta; then
+                ifconfig wlan0 down || ifconfig ra0 down
+                modprobe -r rt2860sta
+            fi
 	    echo 0 > $wlan_control
 	fi
 	;;

-- 
Maintenance of eeepc-acpi-scripts debian package