[zaptel-commits] kpfleming: trunk r1900 - in /trunk: ./ wct4xxp/base.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 22 16:45:39 2007
New Revision: 1900

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1900
Log:
Merged revisions 1899 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1899 | kpfleming | 2007-01-22 16:43:47 -0600 (Mon, 22 Jan 2007) | 11 lines

Merged revisions 1898 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1898 | kpfleming | 2007-01-22 16:43:06 -0600 (Mon, 22 Jan 2007) | 3 lines

use better definition for linked-in firmware data
ensure that hotplug-loaded firmware is released when we are finished with it

........

................

Modified:
    trunk/   (props changed)
    trunk/wct4xxp/base.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Mon Jan 22 16:45:39 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899

Modified: trunk/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/base.c?view=diff&rev=1900&r1=1899&r2=1900
==============================================================================
--- trunk/wct4xxp/base.c (original)
+++ trunk/wct4xxp/base.c Mon Jan 22 16:45:39 2007
@@ -3109,8 +3109,8 @@
 #if !defined(HOTPLUG_FIRMWARE)
 	extern const u32 _binary_OCT6114_64D_ima_size;
 	extern const u32 _binary_OCT6114_128D_ima_size;
-	extern u8 _binary_OCT6114_64D_ima_start;
-	extern u8 _binary_OCT6114_128D_ima_start;
+	extern u8 _binary_OCT6114_64D_ima_start[];
+	extern u8 _binary_OCT6114_128D_ima_start[];
 #endif
 
 	if (!vpmsupport) {
@@ -3146,7 +3146,7 @@
 			return;
 		}
 #else
-		embedded_firmware.data = &_binary_OCT6114_64D_ima_start;
+		embedded_firmware.data = _binary_OCT6114_64D_ima_start;
 		embedded_firmware.size = _binary_OCT6114_64D_ima_size;
 #endif
 		break;
@@ -3158,7 +3158,7 @@
 			return;
 		}
 #else
-		embedded_firmware.data = &_binary_OCT6114_128D_ima_start;
+		embedded_firmware.data = _binary_OCT6114_128D_ima_start;
 		embedded_firmware.size = _binary_OCT6114_128D_ima_size;
 #endif
 		break;
@@ -3169,12 +3169,21 @@
 
 	if (!(wc->vpm450m = init_vpm450m(wc, laws, wc->numspans, firmware))) {
 		printk("VPM450: Failed to initialize\n");
+#if defined(HOTPLUG_FIRMWARE)
+		release_firmware(firmware);
+#endif
 		return;
 	}
+
+#if defined(HOTPLUG_FIRMWARE)
+	release_firmware(firmware);
+#endif
+
 	if (vpmdtmfsupport == -1) {
 		printk("VPM450: hardware DTMF disabled.\n");
 		vpmdtmfsupport = 0;
 	}
+
 	wc->vpm = T4_VPM_PRESENT;
 	printk("VPM450: Present and operational servicing %d span(s)\n", wc->numspans);