projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b386285
)
usb: core: hcd: Fix return value check in usb_hcd_setup_local_mem()
author
Yang Yingliang
<yangyingliang@huawei.com>
Fri, 25 Nov 2022 06:41:20 +0000
(14:41 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:32:41 +0000
(13:32 +0100)
[ 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>
drivers/usb/core/hcd.c
patch
|
blob
|
history
diff --git
a/drivers/usb/core/hcd.c
b/drivers/usb/core/hcd.c
index
faeaace
..
8300bae
100644
(file)
--- a/
drivers/usb/core/hcd.c
+++ b/
drivers/usb/core/hcd.c
@@
-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.