summaryrefslogtreecommitdiff
path: root/kernel/xpp/utils
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-09-09 14:23:56 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-09-09 14:23:56 +0000
commit5d340ad1354a400669a7b25b3c520b8f4a1befea (patch)
tree15a939ad83a60d063d1e6eaadb924a97bddc0469 /kernel/xpp/utils
parent9e83be81c83605c31cdc4fab0473075b15745d4e (diff)
Fix another path to an uninitialized SUB config provided to us from the
controller. From xpp rev. 6071. Merged revisions 4516 via svnmerge from http://svn.digium.com/svn/zaptel/branches/1.2 git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4523 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/xpp/utils')
-rw-r--r--kernel/xpp/utils/fpga_load.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/xpp/utils/fpga_load.c b/kernel/xpp/utils/fpga_load.c
index 7102501..9759fa9 100644
--- a/kernel/xpp/utils/fpga_load.c
+++ b/kernel/xpp/utils/fpga_load.c
@@ -531,6 +531,10 @@ const struct astribank_type *my_usb_device_identify(const char devpath[], struct
}
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",