1 From f1d3861d63a5d79b8968a02eea1dcb01bb684e62 Mon Sep 17 00:00:00 2001
2 From: Peter Chen <peter.chen@nxp.com>
3 Date: Tue, 8 Nov 2016 10:10:44 +0800
4 Subject: usb: gadget: f_uac2: fix error handling at afunc_bind
6 From: Peter Chen <peter.chen@nxp.com>
8 commit f1d3861d63a5d79b8968a02eea1dcb01bb684e62 upstream.
10 The current error handling flow uses incorrect goto label, fix it
12 Fixes: d12a8727171c ("usb: gadget: function: Remove redundant usb_free_all_descriptors")
13 Signed-off-by: Peter Chen <peter.chen@nxp.com>
14 Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
18 drivers/usb/gadget/function/f_uac2.c | 14 +++++++-------
19 1 file changed, 7 insertions(+), 7 deletions(-)
21 --- a/drivers/usb/gadget/function/f_uac2.c
22 +++ b/drivers/usb/gadget/function/f_uac2.c
23 @@ -1067,13 +1067,13 @@ afunc_bind(struct usb_configuration *cfg
24 agdev->out_ep = usb_ep_autoconfig(gadget, &fs_epout_desc);
26 dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
31 agdev->in_ep = usb_ep_autoconfig(gadget, &fs_epin_desc);
33 dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
38 uac2->p_prm.uac2 = uac2;
39 @@ -1091,7 +1091,7 @@ afunc_bind(struct usb_configuration *cfg
40 ret = usb_assign_descriptors(fn, fs_audio_desc, hs_audio_desc, NULL,
46 prm = &agdev->uac2.c_prm;
47 prm->max_psize = hs_epout_desc.wMaxPacketSize;
48 @@ -1106,19 +1106,19 @@ afunc_bind(struct usb_configuration *cfg
49 prm->rbuf = kzalloc(prm->max_psize * USB_XFERS, GFP_KERNEL);
52 - goto err_free_descs;
56 ret = alsa_uac2_init(agdev);
58 - goto err_free_descs;
63 - usb_free_all_descriptors(fn);
65 kfree(agdev->uac2.p_prm.rbuf);
66 kfree(agdev->uac2.c_prm.rbuf);
68 + usb_free_all_descriptors(fn);