merge r20683

SVN-Revision: 21113

diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules
index 6bc53dffe85f5cd9e198fcf2ed992d33a9f0ac46..bb76667bb96fe76e8d152e8071a94f3e93577d6e 100644 (file)
--- a/package/base-files/files/etc/hotplug2-common.rules
+++ b/package/base-files/files/etc/hotplug2-common.rules
@@ -35,8 +35,8 @@ DEVPATH is set, SUBSYSTEM ~~ (input) {
 }
 
 DEVICENAME == device-mapper {
-       nothrottle
-       makedev /dev/mapper/control 0600
+       nothrottle
+       makedev /dev/mapper/control 0600
 }
 
 
@@ -45,8 +45,8 @@ DEVPATH is set {
        makedev /dev/%DEVICENAME% 0644
 }
 
-FIRMWARE is set {
+FIRMWARE is set, ACTION == add {
        nothrottle
-       exec /sbin/hotplug-call firmware
+       load-firmware /lib/firmware
        next
 }

diff --git a/package/base-files/files/sbin/hotplug-call b/package/base-files/files/sbin/hotplug-call
index e56460de938171381c84d9780b40d75ca73b5c2d..0d96e80aaf086400ee13778588f2e885156cf79f 100755 (executable)
--- a/package/base-files/files/sbin/hotplug-call
+++ b/package/base-files/files/sbin/hotplug-call
@@ -1,19 +1,8 @@
 #!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 
 export HOTPLUG_TYPE="$1"
 
-# bypass the normal hotplug path for firmware loading
-# would otherwise cause problems with drivers like bcm43xx
-[ -d /sys/firmware -a "firmware" = "$HOTPLUG_TYPE" -a "add" = "$ACTION" ] && {
-       [ -f "/lib/firmware/$FIRMWARE" ] && {
-               echo 1 > "/sys$DEVPATH/loading"
-               dd if="/lib/firmware/$FIRMWARE" of="/sys$DEVPATH/data" bs=64k
-               echo 0 > "/sys$DEVPATH/loading"
-       } || echo -1 > "/sys$DEVPATH/loading"
-       exit 0
-}
-
 . /etc/functions.sh
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin