No subject

Merged revisions 4516 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/kernel/xpp/utils/fpga_load.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/kernel/xpp/utils/fpga_load.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/xpp/utils/fpga_load.c?view=diff&rev=4523&r1=4522&r2=4523
==============================================================================
--- branches/1.4/kernel/xpp/utils/fpga_load.c (original)
+++ branches/1.4/kernel/xpp/utils/fpga_load.c Tue Sep  9 09:23:56 2008
@@ -531,6 +531,10 @@
 	}
 	dev_desc = &mydev->dev->descriptor;
 	config_desc = mydev->dev->config;
+	if (!config_desc) {
+		ERR("No configuration descriptor: strange USB1 controller?\n");
+		return 0;
+	}
 	for(i = 0; i < sizeof(astribank_types)/sizeof(astribank_types[0]); i++) {
 		if(match_usb_device_identity(config_desc, &astribank_types[i])) {
 			DBG("Identified[%d]: interfaces=%d endpoints=%d: \"%s\"\n",