diff options
author | Takashi Iwai <tiwai@suse.de> | 2023-08-24 09:27:21 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2023-08-24 09:27:21 +0200 |
commit | a057efde80453c68c60e156803578a654b52c39f (patch) | |
tree | 51c312e95de536b6a29d18a12cfdba72029e09ad /drivers/usb/cdns3/cdns3-gadget.c | |
parent | 17a1eab7b70d85fc5711f37bb6e530b771736bb7 (diff) | |
parent | a4a6eed851bb661477654d772807d0e5aee5629c (diff) |
Merge branch 'for-linus' into for-next
Back-merge the 6.5-devel branch for the clean patch application for
6.6 and resolving merge conflicts.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/usb/cdns3/cdns3-gadget.c')
-rw-r--r-- | drivers/usb/cdns3/cdns3-gadget.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c index ea19253fd2d02..aa0111b365bb2 100644 --- a/drivers/usb/cdns3/cdns3-gadget.c +++ b/drivers/usb/cdns3/cdns3-gadget.c @@ -3015,12 +3015,14 @@ static int cdns3_gadget_udc_stop(struct usb_gadget *gadget) static int cdns3_gadget_check_config(struct usb_gadget *gadget) { struct cdns3_device *priv_dev = gadget_to_cdns3_device(gadget); + struct cdns3_endpoint *priv_ep; struct usb_ep *ep; int n_in = 0; int total; list_for_each_entry(ep, &gadget->ep_list, ep_list) { - if (ep->claimed && (ep->address & USB_DIR_IN)) + priv_ep = ep_to_cdns3_ep(ep); + if ((priv_ep->flags & EP_CLAIMED) && (ep->address & USB_DIR_IN)) n_in++; } |