| Message ID | 20190607135709.GC16718@mwanda (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 94b9a70d32db0d1e8eeaeb27d74a5ae712644da9 |
| Headers | show |
| Series | usb/hcd: Fix a NULL vs IS_ERR() bug in usb_hcd_setup_local_mem() | expand |
On 2019-06-07 16:57:09 [+0300], Dan Carpenter wrote: > 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> Sebastian
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index fe631d18c1ed..df8f358685e6 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.
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> --- drivers/usb/core/hcd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)