[svn-commits] kpfleming: branch mogorman/zaptel-1.2-transcoder r2008 - /team/mogorman/zapte...

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 29 15:31:47 2007
New Revision: 2008

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2008
Log:
another attempt to fix non-hotplug firmware loading

Modified:
    team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c

Modified: team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c?view=diff&rev=2008&r1=2007&r2=2008
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c Mon Jan 29 15:31:47 2007
@@ -53,7 +53,7 @@
 static const char *tc400m_firmware = "tc400m-firmware.bin";
 #else
 extern u8 _binary_tc400m_firmware_bin_start[];
-extern void *_binary_tc400m_firmware_bin_size;
+extern void _binary_tc400m_firmware_bin_size;
 #endif
 
 static struct pci_driver driver;
@@ -1396,10 +1396,10 @@
 	/* Yes... this is weird. objcopy gives us a symbol containing
 	   the size of the firmware, not a pointer a variable containing
 	   the size. The only way we can get the value of the symbol
-	   is to take its address, so we define it as a pointer and
-	   then cast that value to the proper type.
+	   is to take its address, so we do that and  then cast that
+	   value to the proper type.
 	*/
-	embedded_firmware.size = (size_t) _binary_tc400m_firmware_bin_size;
+	embedded_firmware.size = (size_t) &_binary_tc400m_firmware_bin_size;
 #endif
 
 	firmware_ver = firmware->data[0];