From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754281AbdIFNSa (ORCPT ); Wed, 6 Sep 2017 09:18:30 -0400 Received: from mout.web.de ([212.227.15.4]:62305 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753508AbdIFNS1 (ORCPT ); Wed, 6 Sep 2017 09:18:27 -0400 Subject: [PATCH 2/2] ALSA: usx2y: Use common error handling code in submit_urbs() From: SF Markus Elfring To: alsa-devel@alsa-project.org, Andrew Morton , Arvind Yadav , Dave Jiang , Jaroslav Kysela , Johan Hovold , Mauro Carvalho Chehab , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: <6743b977-4293-42d2-6c1b-cb83b687bd66@users.sourceforge.net> Message-ID: Date: Wed, 6 Sep 2017 15:17:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <6743b977-4293-42d2-6c1b-cb83b687bd66@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:bBBE2dGO9RLu9YfEzcfFbANuGX0QAqVtEP1SjLLr+FVWVOe0e37 6ncLrjNTxIMuLZdInWN0yW0tBH8W/RTuajWpCXqgLGPyyoNGZa0RZGrghaJgOM43eFnLH/A jm3S2JfE18mGtIynOLf49DxnNNKiVvfBtpB+c1MXvo9YePAcq4RfRTU+V3jKoXqaw5C6ftn pFPB0zjykjpOt7qs6K5ww== X-UI-Out-Filterresults: notjunk:1;V01:K0:a5q9tODLcWU=:wJjVwxX22dTJRwwcY91gPd jyVDvmPug6IUtLQ4OzgLEK5OI9DFb+oYK4MkDhdF3N8K8M1x8D4JhLEr+UpfR2DM581NKjf0N Gu3UB7cTE5DXUi4P7Z4JnEkewCPWvrmfdl777uu/RHs5Tusywclr70+kuIcD/G+VUJSHLq2ec T2OUdmFGQpTmLIKQaSUvNwKkyxET8/qHCsXBxiQTnKY2XePte3JXrYUKo+r5oPnc8OyWppi59 mVJfKM0yoNJgbQmaEuYg7V8VfNifAJSN2VYeERRulYf8/JOecQkLfC60KUYATZqVkV7eDm+YA q6LNveA5XOLVTM5qQk2ENQ2G3Qt2p0Fu5m7BzY1KrbwPfbJSHBnntZaEqSmSQhjEXHIYyWqOr eO3cKAQQHOPR4xHPOmyUtAWxJCm+tlzwuXwdcbELwLwbma7HQi14Qhgu3Zx5s3OCxm1RhXIjt GJEMrBSeDUHj3B0G7fmg7Ra66AtniwTRrtiLLtYyOIL997w5T+ok9OdZ4+Ire5uw32Vg0anbp s3wHAYUpNZ5D4lNlqg5GHu3hDJQgKEQrB05BpgdXsRpkPrLBpdSRuEmKdcoMZV5tBRXjvqFLn lyDNb3pjjULfSOWt15EOQI82Nax5vsndVz0rPtxshGWZp+UrE2OTamMUAMSIzFp1Fzvs6ea4U SWQSogGQqrmztbjv+waZk+B+0CAjRtksjV9tFqMt8J40wOpKcfOlDYS/QtT4NNovNlzqTt7Gg kIkyeZ4yc/buAkKrG8J3+4UbRoCSvsoQrGiZUW243fqnjTOeDe2JC2sI3c8dWZiZw0WfG7/2C dkfWwajYGqaWJ/PQONrryi0lxjXg/rlk3aXgWps5yYdtkvQ33E= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 6 Sep 2017 15:00:08 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- sound/usb/usx2y/usb_stream.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c index fe926cb9192e..4dab49080700 100644 --- a/sound/usb/usx2y/usb_stream.c +++ b/sound/usb/usx2y/usb_stream.c @@ -352,20 +352,22 @@ static int submit_urbs(struct usb_stream_kernel *sk, int err; prepare_inurb(sk->idle_outurb->number_of_packets, sk->idle_inurb); err = usb_submit_urb(sk->idle_inurb, GFP_ATOMIC); - if (err < 0) { - snd_printk(KERN_ERR "%i\n", err); - return err; - } + if (err < 0) + goto report_failure; + sk->idle_inurb = sk->completed_inurb; sk->completed_inurb = inurb; err = usb_submit_urb(sk->idle_outurb, GFP_ATOMIC); - if (err < 0) { - snd_printk(KERN_ERR "%i\n", err); - return err; - } + if (err < 0) + goto report_failure; + sk->idle_outurb = sk->completed_outurb; sk->completed_outurb = outurb; return 0; + +report_failure: + snd_printk(KERN_ERR "%i\n", err); + return err; } #ifdef DEBUG_LOOP_BACK -- 2.14.1