Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c
index 1359b78a624e..6cf22c27f2d2 100644
--- a/drivers/usb/core/buffer.c
+++ b/drivers/usb/core/buffer.c
@@ -66,9 +66,7 @@ int hcd_buffer_create(struct usb_hcd *hcd)
         char            name[16];
         int             i, size;
 
-        if (!IS_ENABLED(CONFIG_HAS_DMA) ||
-            (!is_device_dma_capable(hcd->self.sysdev) &&
-             !hcd->localmem_pool))
+        if (hcd->localmem_pool || !hcd_uses_dma(hcd))
                 return 0;
 
         for (i = 0; i < HCD_BUFFER_POOLS; i++) {
@@ -129,8 +127,7 @@ void *hcd_buffer_alloc(
                 return gen_pool_dma_alloc(hcd->localmem_pool, size, dma);
 
         /* some USB hosts just use PIO */
-        if (!IS_ENABLED(CONFIG_HAS_DMA) ||
-            !is_device_dma_capable(bus->sysdev)) {
+        if (!hcd_uses_dma(hcd)) {
                 *dma = ~(dma_addr_t) 0;
                 return kmalloc(size, mem_flags);
         }
@@ -160,8 +157,7 @@ void hcd_buffer_free(
                 return;
         }
 
-        if (!IS_ENABLED(CONFIG_HAS_DMA) ||
-            !is_device_dma_capable(bus->sysdev)) {
+        if (!hcd_uses_dma(hcd)) {
                 kfree(addr);
                 return;
         }