| From 277392579b17b52689f132649345d2c3e54c5213 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 18 Jun 2021 12:38:35 +0800 |
| Subject: usb: gadget: hid: fix error return code in hid_bind() |
| |
| From: Yang Yingliang <yangyingliang@huawei.com> |
| |
| [ Upstream commit 88693f770bb09c196b1eb5f06a484a254ecb9924 ] |
| |
| Fix to return a negative error code from the error handling |
| case instead of 0. |
| |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> |
| Link: https://lore.kernel.org/r/20210618043835.2641360-1-yangyingliang@huawei.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/usb/gadget/legacy/hid.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/usb/gadget/legacy/hid.c b/drivers/usb/gadget/legacy/hid.c |
| index c4eda7fe7ab4..5b27d289443f 100644 |
| --- a/drivers/usb/gadget/legacy/hid.c |
| +++ b/drivers/usb/gadget/legacy/hid.c |
| @@ -171,8 +171,10 @@ static int hid_bind(struct usb_composite_dev *cdev) |
| struct usb_descriptor_header *usb_desc; |
| |
| usb_desc = usb_otg_descriptor_alloc(gadget); |
| - if (!usb_desc) |
| + if (!usb_desc) { |
| + status = -ENOMEM; |
| goto put; |
| + } |
| usb_otg_descriptor_init(gadget, usb_desc); |
| otg_desc[0] = usb_desc; |
| otg_desc[1] = NULL; |
| -- |
| 2.30.2 |
| |
