diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-15 08:45:20 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-15 08:45:20 +0100 |
commit | aa403f257e992eac33cd9afd1d87ce9299f6db7a (patch) | |
tree | 58d78528f35661b96ccfe8979c97044dca75855c /include/linux/usb.h | |
parent | 14b02f023c094767ffc21156fbb40be52ed2b4f2 (diff) | |
parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) | |
download | linux-aa403f257e992eac33cd9afd1d87ce9299f6db7a.tar.gz linux-aa403f257e992eac33cd9afd1d87ce9299f6db7a.tar.bz2 linux-aa403f257e992eac33cd9afd1d87ce9299f6db7a.zip |
Merge 5.12-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index f15fd0fa95bd..57c1e0ce5eba 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -746,6 +746,8 @@ extern int usb_lock_device_for_reset(struct usb_device *udev, extern int usb_reset_device(struct usb_device *dev); extern void usb_queue_reset_device(struct usb_interface *dev); +extern struct device *usb_intf_get_dma_device(struct usb_interface *intf); + #ifdef CONFIG_ACPI extern int usb_acpi_set_power_state(struct usb_device *hdev, int index, bool enable); |