[zaptel-commits] kpfleming: branch mogorman/zaptel-1.2-transcoder r1907 - in /team/mogorman/za...

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 22 16:58:59 2007
New Revision: 1907

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1907
Log:
yet more branch updates

Modified:
    team/mogorman/zaptel-1.2-transcoder/   (props changed)
    team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c

Propchange: team/mogorman/zaptel-1.2-transcoder/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 22 16:58:59 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-1893
+/branches/1.2:1-1906

Modified: team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c?view=diff&rev=1907&r1=1906&r2=1907
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c Mon Jan 22 16:58:59 2007
@@ -2681,8 +2681,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) {
@@ -2718,7 +2718,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;
@@ -2730,7 +2730,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;
@@ -2741,12 +2741,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);
 }