shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: usb: gadget: f_uac2: improve error handling

Browse Source 
If it is out of memory, we should return -ENOMEM;

Change-Id: I8ad67d982849b96ea94420e568032c2de9339ce7
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from commit 88f950a691)
This commit is contained in:
Peter Chen
2017-01-04 10:19:22 +08:00
committed by Tao Huang
parent 70f45374cd
commit 2b9c1a8e8d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/gadget/function/f_uac2.c
View File

@@ -1099,6 +1099,7 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
prm->rbuf = kzalloc(prm->max_psize * USB_XFERS, GFP_KERNEL);
if (!prm->rbuf) {
prm->max_psize = 0;
ret = -ENOMEM;
goto err_free_descs;
}
@@ -1107,20 +1108,21 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
prm->rbuf = kzalloc(prm->max_psize * USB_XFERS, GFP_KERNEL);
if (!prm->rbuf) {
prm->max_psize = 0;
goto err;
ret = -ENOMEM;
goto err_no_memory;
}
ret = alsa_uac2_init(agdev);
if (ret)
goto err;
goto err_no_memory;
return 0;
err:
err_no_memory:
kfree(agdev->uac2.p_prm.rbuf);
kfree(agdev->uac2.c_prm.rbuf);
err_free_descs:
usb_free_all_descriptors(fn);
return -EINVAL;
return ret;
}
static int