diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-11 10:05:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-15 15:17:07 +0200 |
| commit | dd3ecf17ba70a70d2c9ef9ba725281b84f8eef12 (patch) | |
| tree | edddd7da4fb718a3849c912b65691175798bf1ad | |
| parent | 141822aa3f79efc8a2ec3ed464f2fd2c93ccd803 (diff) | |
| download | linux-dd3ecf17ba70a70d2c9ef9ba725281b84f8eef12.tar.gz linux-dd3ecf17ba70a70d2c9ef9ba725281b84f8eef12.tar.bz2 linux-dd3ecf17ba70a70d2c9ef9ba725281b84f8eef12.zip | |
usb: don't create dma pools for HCDs with a localmem_pool
If the HCD provides a localmem pool we will never use the DMA pools, so
don't create them.
Fixes: b0310c2f09bb ("USB: use genalloc for USB HCs with local memory")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20190811080520.21712-2-hch@lst.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/core/buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c index 1359b78a624e..1a5b3dcae930 100644 --- a/drivers/usb/core/buffer.c +++ b/drivers/usb/core/buffer.c @@ -66,9 +66,9 @@ 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 || + !IS_ENABLED(CONFIG_HAS_DMA) || + !is_device_dma_capable(hcd->self.sysdev)) return 0; for (i = 0; i < HCD_BUFFER_POOLS; i++) { |