From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751414AbdIOH7t (ORCPT ); Fri, 15 Sep 2017 03:59:49 -0400 Received: from mout.web.de ([217.72.192.78]:64150 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750866AbdIOH7r (ORCPT ); Fri, 15 Sep 2017 03:59:47 -0400 Subject: [PATCH 8/9] [media] tm6000: Use common error handling code in tm6000_start_stream() From: SF Markus Elfring To: linux-media@vger.kernel.org, Andi Shyti , Andrew Morton , Arvind Yadav , Bhumika Goyal , Christophe Jaillet , =?UTF-8?Q?David_H=c3=a4rdeman?= , Hans Verkuil , Laurent Pinchart , Masahiro Yamada , Mauro Carvalho Chehab , Sakari Ailus , Santosh Kumar Singh , Sean Young , Wei Yongjun Cc: LKML , kernel-janitors@vger.kernel.org References: <2aade468-5dfd-76ee-f59f-c25864930f61@users.sourceforge.net> Message-ID: <0aac22c7-bac1-190c-d5b8-9129d309ca3f@users.sourceforge.net> Date: Fri, 15 Sep 2017 09:59:19 +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: <2aade468-5dfd-76ee-f59f-c25864930f61@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:Pa1ccEirlVifQfacJcrd1aiNvqrFHHzgKpkhLeWSYtW6S8uwEbW ldVS0ohB8droQuHrNuiX1u+YzC5uLXHln5KDsUzYvu5T4X1+bEcM7g3yTJvpZzHbfjxjjoo n0yWfE+1oFh8hvML/SiJHJFSN5wF7gf0p3kfmKHY8gEk0MMinMNDPil/6Kt8XmukUc9t+5z FE5lg6xUBUCqZEH5sIDZw== X-UI-Out-Filterresults: notjunk:1;V01:K0:tzGT+7AcLyc=:dKpH9gVzwVlMJifKr/bev2 mHo6QwsqxhVVCRVV/AZn2kugQhWgPkuw2fGpFyKswaR6JeR8W0W9utsrjzUETFL4yaXxt/wk9 ZcVQwaFUMO2VNZGYFqo9RPI+QXQYsQQ5Rp26mtmeugPvCllPOpttWPSaozC/kDkmhGpsHdqa8 yUfnA49o+qlQ2uremJDilUFfZDzZRafEvcMqJWnxt7gzV4SvnljjJyFsexp+DpXVKLa3taMAp dUhv3aUw2kHbaU+JBmbhdzGy+OgPTxufHo1BzYbpyw7A6v5bxSovZpRa1I1tCOJbtx2tX9KT2 15fw5grQkCSXX/0RhIe8FO5XTUp0Z8HZzvsvagBsJa81V46yhzY8k12wUg4F8WKh6maMGacYl yZitUVwyjijGJpbZ8Tn1lb3EwsNj2hPSdQ41EdneLXabscDYE3CKZ/24Mqhs4Ybq8wNPlewRe Y2zChypfv8thmnJ3DZsvcF3fKICa55d+mshIKknmxYItXydxHgCXbGP03NWEv05oKR0PZhbyl UNgQqBTa9Js2+HJ9kGx5C/HjciYQGUxFa1QfeGMhC+5cXk30uar3pdl9ildrXnH+eSPj2O0bM CS7abj5Q/AzQvg6C6aophsdgPTWLGpv57nA1qshn6grBYYc+cJoi0msHHXKGAVWOnMvniF+K9 KbkjLuTLz8HowrWWFM4m6bcGM9sLtEjyvr2B6qQirQ+fwNsvlqsEWPjOYU4k1Dc+TdHj/gjNj AD+WZQr8GttD7QhTJs3vxMA3RP5gCtymF19y0dSWAObAO/ooq//3Ysv+AGYrKCyJtfJfWdIuJ aOR48tRnkriziw/G/0XgJTtt4Gk3OVei5GP5SLYSYl3zGUjOZY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 15 Sep 2017 07:47:41 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of this function. Signed-off-by: Markus Elfring --- drivers/media/usb/tm6000/tm6000-dvb.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c index 855874134fcf..b45e54d5cab9 100644 --- a/drivers/media/usb/tm6000/tm6000-dvb.c +++ b/drivers/media/usb/tm6000/tm6000-dvb.c @@ -134,8 +134,8 @@ static int tm6000_start_stream(struct tm6000_core *dev) dvb->bulk_urb->transfer_buffer = kzalloc(size, GFP_KERNEL); if (!dvb->bulk_urb->transfer_buffer) { - usb_free_urb(dvb->bulk_urb); - return -ENOMEM; + ret = -ENOMEM; + goto free_urb; } usb_fill_bulk_urb(dvb->bulk_urb, dev->udev, pipe, @@ -160,11 +160,14 @@ static int tm6000_start_stream(struct tm6000_core *dev) ret); kfree(dvb->bulk_urb->transfer_buffer); - usb_free_urb(dvb->bulk_urb); - return ret; + goto free_urb; } return 0; + +free_urb: + usb_free_urb(dvb->bulk_urb); + return ret; } static void tm6000_stop_stream(struct tm6000_core *dev) -- 2.14.1