diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2019-06-07 16:57:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-25 10:40:02 +0200 |
| commit | 94b9a70d32db0d1e8eeaeb27d74a5ae712644da9 (patch) | |
| tree | d1cb2b90a6a3c9936aa8956507f02748c4e5eef9 /drivers | |
| parent | d74ffae8b8dd17eaa8b82fc163e6aa2076dc8fb1 (diff) | |
| download | linux-stable-94b9a70d32db0d1e8eeaeb27d74a5ae712644da9.tar.gz linux-stable-94b9a70d32db0d1e8eeaeb27d74a5ae712644da9.tar.bz2 linux-stable-94b9a70d32db0d1e8eeaeb27d74a5ae712644da9.zip | |
usb/hcd: Fix a NULL vs IS_ERR() bug in usb_hcd_setup_local_mem()
The devm_memremap() function doesn't return NULL, it returns error
pointers.
Fixes: b0310c2f09bb ("USB: use genalloc for USB HCs with local memory")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: https://lore.kernel.org/r/20190607135709.GC16718@mwanda
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/core/hcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 88533938ce19..9320787ac2e6 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -3052,8 +3052,8 @@ int usb_hcd_setup_local_mem(struct usb_hcd *hcd, phys_addr_t phys_addr, local_mem = devm_memremap(hcd->self.sysdev, phys_addr, size, MEMREMAP_WC); - if (!local_mem) - return -ENOMEM; + if (IS_ERR(local_mem)) + return PTR_ERR(local_mem); /* * Here we pass a dma_addr_t but the arg type is a phys_addr_t. |