| Message ID | 20201112085324.181903-1-chenzhou10@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | usb: gadget: mass_storage: fix error return code in msg_bind() | expand |
On 2020/11/12 16:53, Chen Zhou wrote: > Fix to return a negative error code from the error handling case > instead of 0 in function msg_bind(), as done elsewhere in this > function. > > Fixes: d86788979761 ("usb: gadget: mass_storage: allocate and init otg descriptor by otg capabilities") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Chen Zhou <chenzhou10@huawei.com> > --- > drivers/usb/gadget/legacy/mass_storage.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/gadget/legacy/mass_storage.c b/drivers/usb/gadget/legacy/mass_storage.c > index 9ed22c5fb7fe..7a88c5282d61 100644 > --- a/drivers/usb/gadget/legacy/mass_storage.c > +++ b/drivers/usb/gadget/legacy/mass_storage.c > @@ -175,8 +175,10 @@ static int msg_bind(struct usb_composite_dev *cdev) > struct usb_descriptor_header *usb_desc; > > usb_desc = usb_otg_descriptor_alloc(cdev->gadget); > - if (!usb_desc) > + if (IS_ERR(usb_desc)) { > + status = PTR_ERR(usb_desc); > goto fail_string_ids; > + } > usb_otg_descriptor_init(cdev->gadget, usb_desc); > otg_desc[0] = usb_desc; > otg_desc[1] = NULL; Ignore this.
diff --git a/drivers/usb/gadget/legacy/mass_storage.c b/drivers/usb/gadget/legacy/mass_storage.c index 9ed22c5fb7fe..7a88c5282d61 100644 --- a/drivers/usb/gadget/legacy/mass_storage.c +++ b/drivers/usb/gadget/legacy/mass_storage.c @@ -175,8 +175,10 @@ static int msg_bind(struct usb_composite_dev *cdev) struct usb_descriptor_header *usb_desc; usb_desc = usb_otg_descriptor_alloc(cdev->gadget); - if (!usb_desc) + if (IS_ERR(usb_desc)) { + status = PTR_ERR(usb_desc); goto fail_string_ids; + } usb_otg_descriptor_init(cdev->gadget, usb_desc); otg_desc[0] = usb_desc; otg_desc[1] = NULL;
Fix to return a negative error code from the error handling case instead of 0 in function msg_bind(), as done elsewhere in this function. Fixes: d86788979761 ("usb: gadget: mass_storage: allocate and init otg descriptor by otg capabilities") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Chen Zhou <chenzhou10@huawei.com> --- drivers/usb/gadget/legacy/mass_storage.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)