Commit 3c347cda authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

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



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: 9ba26f5c ("ARM: sa1100/assabet: move dmabounce hack to ohci driver")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20221125064120.2842452-1-yangyingliang@huawei.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57b7b733

drivers/usb/core/hcd.c

+5 −1
Original line number Diff line number Diff line
@@ -3133,8 +3133,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.