diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-24 17:46:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-24 17:46:53 +0200 |
| commit | 109e37a6731c492ad35e86d3390a26ba55d33755 (patch) | |
| tree | 06cd81661d63077e959b0e693134cf5a1ae60d76 /drivers/usb/dwc3/gadget.h | |
| parent | ddf12f04dc5b284133662f81a9c4c46a72d3c6ba (diff) | |
| parent | 47265c067c0d129f3a0e94bc221293a780af9d78 (diff) | |
| download | linux-109e37a6731c492ad35e86d3390a26ba55d33755.tar.gz | |
Merge tag 'usb-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
usb: changes for v4.18 merge window
A total of 98 non-merge commits, the biggest part being in dwc3 this
time around with a large refactoring of dwc3's transfer handling code.
We also have a new driver for Aspeed virtual hub controller.
Apart from that, just a list of miscellaneous fixes all over the place.
Diffstat (limited to 'drivers/usb/dwc3/gadget.h')
| -rw-r--r-- | drivers/usb/dwc3/gadget.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h index 578aa856f986..db610c56f1d6 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -98,13 +98,12 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol); * Caller should take care of locking. Returns the transfer resource * index for a given endpoint. */ -static inline u32 dwc3_gadget_ep_get_transfer_index(struct dwc3_ep *dep) +static inline void dwc3_gadget_ep_get_transfer_index(struct dwc3_ep *dep) { u32 res_id; res_id = dwc3_readl(dep->regs, DWC3_DEPCMD); - - return DWC3_DEPCMD_GET_RSC_IDX(res_id); + dep->resource_index = DWC3_DEPCMD_GET_RSC_IDX(res_id); } #endif /* __DRIVERS_USB_DWC3_GADGET_H */ |