diff --git a/[refs] b/[refs]
index 0ca4b28ffbe2..b381a25ccd0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 737a3bb9416ce2a7c7a4170852473a4fcc9c67e8
+refs/heads/master: 3317fad5e9c741e758707879c68e20de2cb08f87
diff --git a/trunk/Documentation/firmware_class/hotplug-script b/trunk/Documentation/firmware_class/hotplug-script
index 1990130f2ab1..8143a950b607 100644
--- a/trunk/Documentation/firmware_class/hotplug-script
+++ b/trunk/Documentation/firmware_class/hotplug-script
@@ -6,11 +6,12 @@
 
 HOTPLUG_FW_DIR=/usr/lib/hotplug/firmware/
 
-echo 1 > /sys/$DEVPATH/loading
-cat $HOTPLUG_FW_DIR/$FIRMWARE > /sys/$DEVPATH/data
-echo 0 > /sys/$DEVPATH/loading
-
-# To cancel the load in case of error:
-#
-#	echo -1 > /sys/$DEVPATH/loading
-#
+if [ "$SUBSYSTEM" == "firmware" -a "$ACTION" == "add" ]; then
+  if [ -f $HOTPLUG_FW_DIR/$FIRMWARE ]; then
+    echo 1 > /sys/$DEVPATH/loading
+    cat $HOTPLUG_FW_DIR/$FIRMWARE > /sys/$DEVPATH/data
+    echo 0 > /sys/$DEVPATH/loading
+  else
+    echo -1 > /sys/$DEVPATH/loading
+  fi
+fi