usb: core: hcd: Fix return value check in usb_hcd_setup_local_mem()

[ Upstream commit 3c347cdafa3db43337870006e5c2d7b78a8dae20 ]

If dmam_alloc_attrs() fails, it returns NULL pointer and never
return ERR_PTR(), so repleace IS_ERR() with IS_ERR_OR_NULL()
and if it's NULL, returns -ENOMEM.

Fixes: 9ba26f5cecd8 ("ARM: sa1100/assabet: move dmabounce hack to ohci driver")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20221125064120.2842452-1-yangyingliang@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 94b305bbd621b4b41d90b778c7ebded548ff62df..4bd9d799f1b9703e5d7a553c016d79c02664ae17 100644 (file)
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -3140,8 +3140,12 @@ int usb_hcd_setup_local_mem(struct usb_hcd *hcd, phys_addr_t phys_addr,
                                             GFP_KERNEL,
                                             DMA_ATTR_WRITE_COMBINE);
 
-       if (IS_ERR(local_mem))
+       if (IS_ERR_OR_NULL(local_mem)) {
+               if (!local_mem)
+                       return -ENOMEM;
+
                return PTR_ERR(local_mem);
+       }
 
        /*
         * Here we pass a dma_addr_t but the arg type is a phys_addr_t.