Index: channels/chan_iax2.c
===================================================================
--- channels/chan_iax2.c	(revision 81431)
+++ channels/chan_iax2.c	(working copy)
@@ -1886,7 +1886,7 @@
 }
 
 
-static void reload_firmware(void)
+static void reload_firmware(int unload)
 {
 	struct iax_firmware *cur = NULL;
 	DIR *fwd;
@@ -1899,21 +1899,23 @@
 	AST_LIST_TRAVERSE(&firmwares, cur, list)
 		cur->dead = 1;
 
-	/* Now that we have marked them dead... load new ones */
-	snprintf(dir, sizeof(dir), "%s/firmware/iax", (char *)ast_config_AST_DATA_DIR);
-	fwd = opendir(dir);
-	if (fwd) {
-		while((de = readdir(fwd))) {
-			if (de->d_name[0] != '.') {
-				snprintf(fn, sizeof(fn), "%s/%s", dir, de->d_name);
-				if (!try_firmware(fn)) {
-					ast_verb(2, "Loaded firmware '%s'\n", de->d_name);
+	if (!unload) {
+		/* Now that we have marked them dead... load new ones */
+		snprintf(dir, sizeof(dir), "%s/firmware/iax", (char *)ast_config_AST_DATA_DIR);
+		fwd = opendir(dir);
+		if (fwd) {
+			while((de = readdir(fwd))) {
+				if (de->d_name[0] != '.') {
+					snprintf(fn, sizeof(fn), "%s/%s", dir, de->d_name);
+					if (!try_firmware(fn)) {
+						ast_verb(2, "Loaded firmware '%s'\n", de->d_name);
+					}
 				}
 			}
-		}
-		closedir(fwd);
-	} else 
-		ast_log(LOG_WARNING, "Error opening firmware directory '%s': %s\n", dir, strerror(errno));
+			closedir(fwd);
+		} else 
+			ast_log(LOG_WARNING, "Error opening firmware directory '%s': %s\n", dir, strerror(errno));
+	}
 
 	/* Clean up leftovers */
 	AST_LIST_TRAVERSE_SAFE_BEGIN(&firmwares, cur, list) {
@@ -10386,7 +10388,7 @@
 		ao2_callback(peers, 0, iax2_poke_peer_cb, NULL);
 	}
 
-	reload_firmware();
+	reload_firmware(0);
 	iax_provision_reload(1);
 
 	return 0;
@@ -11191,6 +11193,7 @@
 	delete_users();
 	iax_provision_unload();
 	sched_context_destroy(sched);
+	reload_firmware(1);
 
 	for (x = 0; x < IAX_MAX_CALLS; x++)
 		ast_mutex_destroy(&iaxsl[x]);
@@ -11321,7 +11324,7 @@
 	ao2_callback(peers, 0, iax2_poke_peer_cb, NULL);
 
 
-	reload_firmware();
+	reload_firmware(0);
 	iax_provision_reload(0);
 
 	return AST_MODULE_LOAD_SUCCESS;