From 2b9c1a8e8d1d2a9e9daa4f7d7bbd935296deb390 Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Wed, 4 Jan 2017 10:19:22 +0800 Subject: [PATCH] UPSTREAM: usb: gadget: f_uac2: improve error handling If it is out of memory, we should return -ENOMEM; Change-Id: I8ad67d982849b96ea94420e568032c2de9339ce7 Signed-off-by: Peter Chen Signed-off-by: Felipe Balbi Signed-off-by: William Wu (cherry picked from commit 88f950a69174eca60d3e7df558ecb53d6d4d4e6f) --- drivers/usb/gadget/function/f_uac2.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c index ac190650314a..380092fcf02a 100644 --- a/drivers/usb/gadget/function/f_uac2.c +++ b/drivers/usb/gadget/function/f_uac2.c @@ -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