david/ipxe
david/ipxe
Archived
1
0
Fork 0
Code

[usb] Add function to device's function list before attempting probe

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2015-09-05 18:29:53 +01:00
parent 866e525814
commit 82bc90dd88
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drivers/bus/usb.c
View File

@ -1097,6 +1097,7 @@ usb_probe_all ( struct usb_device *usb,
"%s-%d.%d", usb->name, config->config, first );
INIT_LIST_HEAD ( &func->dev.children );
func->dev.parent = bus->dev;
list_add_tail ( &func->list, &usb->functions );
/* Identify function */
if ( ( rc = usb_function ( func, config, first ) ) != 0 )
@ -1125,22 +1126,19 @@ usb_probe_all ( struct usb_device *usb,
func->interface[i] );
DBGC ( usb, " using driver %s\n", func->dev.driver_name );
/* Add to list of functions */
list_add ( &func->list, &usb->functions );
/* Add to device hierarchy */
list_add_tail ( &func->dev.siblings, &bus->dev->children );
continue;
list_del ( &func->dev.siblings );
list_del ( &func->list );
usb_remove ( func );
err_probe:
free ( func );
err_alloc:
err_interface:
err_function:
list_del ( &func->list );
free ( func );
err_alloc:
/* Continue registering other functions */
continue;
}