projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c17e724
)
USB: ohci-sm501: fix error return code in ohci_hcd_sm501_drv_probe()
author
Wei Yongjun
<weiyongjun1@huawei.com>
Wed, 6 May 2020 13:56:25 +0000
(13:56 +0000)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:50:26 +0000
(17:50 +0200)
[ Upstream commit
b919e077cccfbb77beb98809568b2fb0b4d113ec
]
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Fixes:
7d9e6f5aebe8
("usb: host: ohci-sm501: init genalloc for local memory")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Link:
https://lore.kernel.org/r/20200506135625.106910-1-weiyongjun1@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/usb/host/ohci-sm501.c
patch
|
blob
|
history
diff --git
a/drivers/usb/host/ohci-sm501.c
b/drivers/usb/host/ohci-sm501.c
index
c158cda
..
cff9652
100644
(file)
--- a/
drivers/usb/host/ohci-sm501.c
+++ b/
drivers/usb/host/ohci-sm501.c
@@
-157,9
+157,10
@@
static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
* the call to usb_hcd_setup_local_mem() below does just that.
*/
- if (usb_hcd_setup_local_mem(hcd, mem->start,
- mem->start - mem->parent->start,
- resource_size(mem)) < 0)
+ retval = usb_hcd_setup_local_mem(hcd, mem->start,
+ mem->start - mem->parent->start,
+ resource_size(mem));
+ if (retval < 0)
goto err5;
retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval)