Change in osmo-e1d[master]: usb: Claim and set interface alt-setting only for used lines

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29727 ) Change subject: usb: Claim and set interface alt-setting only for used lines ...................................................................... usb: Claim and set interface alt-setting only for used lines If a line is not auto-created, there is no point on claiming the matching interface and even less point setting the alt setting that will try to use USB isoc bandwith. With this you can no use only line 1 and not line 0 of a ice1usb for instance. While previously it would still "enable" line 0 and then line 1 would fail because on BW issues most of the case. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Iea5d72272f11875e7a32c78b60c188590deda831 --- M src/usb.c 1 file changed, 16 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/usb.c b/src/usb.c index 47fff14..c8ad97f 100644 --- a/src/usb.c +++ b/src/usb.c @@ -904,21 +904,6 @@ } } - /* Get interface and set it up */ - ret = libusb_claim_interface(devh, id->bInterfaceNumber); - if (ret) { - LOGP(DE1D, LOGL_ERROR, "Failed to claim interface %d:%s\n", id->bInterfaceNumber, - libusb_strerror(ret)); - goto next_interface; - } - - ret = libusb_set_interface_alt_setting(devh, id->bInterfaceNumber, 1); - if (ret) { - LOGP(DE1D, LOGL_ERROR, "Failed to set interface %d altsetting:%s\n", id->bInterfaceNumber, - libusb_strerror(ret)); - goto next_interface; - } - /* Setup driver data and find endpoints */ line_data = talloc_zero(e1d->ctx, struct e1_usb_line_data); @@ -965,6 +950,22 @@ line->drv_data = line_data; } + /* Get interface and set it up */ + ret = libusb_claim_interface(devh, id->bInterfaceNumber); + if (ret) { + LOGP(DE1D, LOGL_ERROR, "Failed to claim interface %d:%s\n", id->bInterfaceNumber, + libusb_strerror(ret)); + goto next_interface; + } + + ret = libusb_set_interface_alt_setting(devh, id->bInterfaceNumber, 1); + if (ret) { + LOGP(DE1D, LOGL_ERROR, "Failed to set interface %d altsetting:%s\n", id->bInterfaceNumber, + libusb_strerror(ret)); + goto next_interface; + } + + /* Create data flows and start the line */ line_data->flow_in = e1uf_create(line, e1_usb_xfer_in, line_data->ep_in, 4, line_data->pkt_size, 4); line_data->flow_out = e1uf_create(line, e1_usb_xfer_out, line_data->ep_out, 4, line_data->pkt_size, 4); line_data->flow_fb = e1uf_create(line, e1_usb_xfer_fb, line_data->ep_fb, 2, 3, 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iea5d72272f11875e7a32c78b60c188590deda831 Gerrit-Change-Number: 29727 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged