Set the ivars _after_ checking that the bdev was correctly created instead

of before.
This commit is contained in:
Nick Hibma 2002-06-17 20:52:26 +00:00
parent 1a283dd436
commit 3a6a5935a8

View File

@ -804,11 +804,11 @@ usbd_probe_and_attach(device_ptr_t parent, usbd_device_handle dev,
*/
device_t bdev;
bdev = device_add_child(parent, NULL, -1);
device_set_ivars(bdev, &uaa);
if (!bdev) {
printf("%s: Device creation failed\n", USBDEVNAME(dev->bus->bdev));
return (USBD_INVAL);
}
device_set_ivars(bdev, &uaa);
device_quiet(bdev);
#endif
@ -890,12 +890,12 @@ usbd_probe_and_attach(device_ptr_t parent, usbd_device_handle dev,
#if defined(__FreeBSD__)
/* create another child for the next iface */
bdev = device_add_child(parent, NULL, -1);
device_set_ivars(bdev, &uaa);
if (!bdev) {
printf("%s: Device creation failed\n",
USBDEVNAME(dev->bus->bdev));
return (USBD_NORMAL_COMPLETION);
}
device_set_ivars(bdev, &uaa);
device_quiet(bdev);
#endif
}