Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4b37389 authored by Wei Yongjun's avatar Wei Yongjun Committed by Greg Kroah-Hartman
Browse files

usb: gadget: legacy: fix error return code in cdc_bind() 



commit e8f7f9e3499a6d96f7f63a4818dc7d0f45a7783b upstream.

If 'usb_otg_descriptor_alloc()' fails, we must return a
negative error code -ENOMEM, not 0.

Fixes: ab6796ae ("usb: gadget: cdc2: allocate and init otg descriptor by otg capabilities")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f713df10

drivers/usb/gadget/legacy/cdc2.c

+3 −1
Original line number Diff line number Diff line
@@ -183,8 +183,10 @@ static int cdc_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 fail1;

		}

		usb_otg_descriptor_init(gadget, usb_desc);

		otg_desc[0] = usb_desc;

		otg_desc[1] = NULL;