firmware: Honor DESTDIR when installing firmware.

This fixes a regression introduced first in release 2.9.1 with commit
(7ce8498465 "firmware: Refactor by using build_tools/install_firmware.")
which prevents from installing the firmware in a location other than the system
root.

Bug: https://issues.asterisk.org/jira/browse/DAHLIN-337
Reported-by: Anthony Messina <amessina@messinet.com>
Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
[edited the commit message]
Signed-off-by: Shaun Ruffell <sruffell@digium.com>

drivers/dahdi/firmware/Makefile

@@ -83,6 +83,7 @@ OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMOCT032=dahdi-fw-vpmoct032.o)
 DOWNLOAD=wget
 WGET=wget
 INSTALL_FIRMWARE=../../../build_tools/install_firmware
+RUN_INST=$(INSTALL_FIRMWARE) $(1) $(2) $(DESTDIR)
 
 # If "fetch" is used, --continue is not a valid option.
 ifeq ($(WGET),wget)
@@ -126,21 +127,21 @@ $(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware:
 
 # Install all downloaded firmware images for hotplug usage
 hotplug-install: $(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware $(FIRMWARE)
-	@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-032 $(OCT6114_032_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-064 $(OCT6114_064_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-128 $(OCT6114_128_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-256 $(OCT6114_256_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-tc400m $(TC400M_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-hx8 $(HX8_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-vpmoct032 $(VPMOCT032_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-te820 $(WCT820_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-te133 $(TE133_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-te134 $(TE134_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-te435 $(TE435_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-a8a $(A8A_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-a8b $(A8B_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-a4a $(A4A_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-a4b $(A4B_VERSION)
+	@$(call RUN_INST,dahdi-fw-oct6114-032,$(OCT6114_032_VERSION))
+	@$(call RUN_INST,dahdi-fw-oct6114-064,$(OCT6114_064_VERSION))
+	@$(call RUN_INST,dahdi-fw-oct6114-128,$(OCT6114_128_VERSION))
+	@$(call RUN_INST,dahdi-fw-oct6114-256,$(OCT6114_256_VERSION))
+	@$(call RUN_INST,dahdi-fw-tc400m,$(TC400M_VERSION))
+	@$(call RUN_INST,dahdi-fw-hx8,$(HX8_VERSION))
+	@$(call RUN_INST,dahdi-fw-vpmoct032,$(VPMOCT032_VERSION))
+	@$(call RUN_INST,dahdi-fw-te820,$(WCT820_VERSION))
+	@$(call RUN_INST,dahdi-fw-te133,$(TE133_VERSION))
+	@$(call RUN_INST,dahdi-fw-te134,$(TE134_VERSION))
+	@$(call RUN_INST,dahdi-fw-te435,$(TE435_VERSION))
+	@$(call RUN_INST,dahdi-fw-a8a,$(A8A_VERSION))
+	@$(call RUN_INST,dahdi-fw-a8b,$(A8B_VERSION))
+	@$(call RUN_INST,dahdi-fw-a4a,$(A4A_VERSION))
+	@$(call RUN_INST,dahdi-fw-a4b,$(A4B_VERSION))
 
 # Uninstall any installed dahdi firmware images from hotplug firmware directories
 hotplug-uninstall:

drivers/dahdi/xpp/xbus-core.c

@@ -953,10 +953,14 @@ int xbus_register_dahdi_device(xbus_t *xbus)
 		goto err;
 	}
 	if (xbus_is_registered(xbus)) {
-		XBUS_ERR(xbus, "Already registered to DAHDI\n");
-		WARN_ON(1);
-		ret = -EINVAL;
-		goto err;
+		/*
+		 * Ignore duplicate registrations (from dahdi_registration)
+		 * Until we completely migrate to dahdi_autoreg=1 and
+		 * hotplug-based span-assignments
+		 */
+		XBUS_DBG(DEVICES, xbus, "Already registered to DAHDI\n");
+		ret = 0;
+		goto out;
 	}
 	xbus->ddev = dahdi_create_device();
 	if (!xbus->ddev) {

drivers/dahdi/xpp/xbus-sysfs.c

@@ -23,7 +23,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/errno.h>
-#include <linux/mutex.h>
 #include <linux/proc_fs.h>
 #ifdef	PROTOCOL_DEBUG
 #include <linux/ctype.h>
@@ -596,8 +595,6 @@ static DEVICE_ATTR_READER(span_show, dev, buf)
 	return len;
 }
 
-static DEFINE_MUTEX(span_store_mutex);
-
 /*
  * For backward compatibility with old dahdi-tools
  * Remove after dahdi_registration is upgraded
@@ -619,29 +616,10 @@ static DEVICE_ATTR_WRITER(span_store, dev, buf, count)
 		return -ENODEV;
 	XPD_DBG(DEVICES, xpd, "%s -- deprecated (should use assigned-spans)\n",
 		(dahdi_reg) ? "register" : "unregister");
-	ret = mutex_lock_interruptible(&span_store_mutex);
-	if (ret < 0) {
-		XBUS_ERR(xpd->xbus, "span_store_mutex already taken\n");
-		return ret;
-	}
-	if (xbus_is_registered(xpd->xbus)) {
-		if (dahdi_reg) {
-			XPD_DBG(DEVICES, xpd,
-				"already registered %s. Ignored.\n",
-				xpd->xbus->busname);
-		} else {
-			xbus_unregister_dahdi_device(xpd->xbus);
-		}
-	} else {
-		if (!dahdi_reg) {
-			XPD_DBG(DEVICES, xpd,
-				"already unregistered %s. Ignored.\n",
-				xpd->xbus->busname);
-		} else {
-			xbus_register_dahdi_device(xpd->xbus);
-		}
-	}
-	mutex_unlock(&span_store_mutex);
+	if (dahdi_reg)
+		xbus_register_dahdi_device(xpd->xbus);
+	  else
+		xbus_unregister_dahdi_device(xpd->xbus);
 	return count;
 }