diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:37 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:37 +0000 |
commit | 94ac2ab3fff96814d7460a27a0e9d004abbd4128 (patch) | |
tree | 9a4eb8cc234b540b0f4b93363109cdd37a20540b /drivers/net/wireless/ath/carl9170/usb.c | |
parent | Adding debian version 6.8.12-1. (diff) | |
download | linux-94ac2ab3fff96814d7460a27a0e9d004abbd4128.tar.xz linux-94ac2ab3fff96814d7460a27a0e9d004abbd4128.zip |
Merging upstream version 6.9.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/usb.c')
-rw-r--r-- | drivers/net/wireless/ath/carl9170/usb.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c index a3e03580cd..c4edf83559 100644 --- a/drivers/net/wireless/ath/carl9170/usb.c +++ b/drivers/net/wireless/ath/carl9170/usb.c @@ -1069,38 +1069,6 @@ static int carl9170_usb_probe(struct usb_interface *intf, ar->usb_ep_cmd_is_bulk = true; } - /* Verify that all expected endpoints are present */ - if (ar->usb_ep_cmd_is_bulk) { - u8 bulk_ep_addr[] = { - AR9170_USB_EP_RX | USB_DIR_IN, - AR9170_USB_EP_TX | USB_DIR_OUT, - AR9170_USB_EP_CMD | USB_DIR_OUT, - 0}; - u8 int_ep_addr[] = { - AR9170_USB_EP_IRQ | USB_DIR_IN, - 0}; - if (!usb_check_bulk_endpoints(intf, bulk_ep_addr) || - !usb_check_int_endpoints(intf, int_ep_addr)) - err = -ENODEV; - } else { - u8 bulk_ep_addr[] = { - AR9170_USB_EP_RX | USB_DIR_IN, - AR9170_USB_EP_TX | USB_DIR_OUT, - 0}; - u8 int_ep_addr[] = { - AR9170_USB_EP_IRQ | USB_DIR_IN, - AR9170_USB_EP_CMD | USB_DIR_OUT, - 0}; - if (!usb_check_bulk_endpoints(intf, bulk_ep_addr) || - !usb_check_int_endpoints(intf, int_ep_addr)) - err = -ENODEV; - } - - if (err) { - carl9170_free(ar); - return err; - } - usb_set_intfdata(intf, ar); SET_IEEE80211_DEV(ar->hw, &intf->dev); |