From patchwork Sun Dec 25 18:39:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9488293 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7C6CC60471 for ; Sun, 25 Dec 2016 18:39:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70A4F1FF65 for ; Sun, 25 Dec 2016 18:39:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 615C225250; Sun, 25 Dec 2016 18:39:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 077BA1FF65 for ; Sun, 25 Dec 2016 18:39:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753696AbcLYSjM (ORCPT ); Sun, 25 Dec 2016 13:39:12 -0500 Received: from mout.web.de ([217.72.192.78]:53276 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753245AbcLYSjL (ORCPT ); Sun, 25 Dec 2016 13:39:11 -0500 Received: from [192.168.1.2] ([77.182.80.223]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MUnYm-1c2cUf0o2u-00YC3c; Sun, 25 Dec 2016 19:39:05 +0100 Subject: [PATCH 08/19] [media] uvc_driver: Rename a jump label in uvc_scan_fallback() To: linux-media@vger.kernel.org, Laurent Pinchart , Mauro Carvalho Chehab References: <47aa4314-74ec-b2bf-ee3b-aad4d6e9f0a2@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <9b6619ba-da8c-71c4-c700-c2cf1c8e4955@users.sourceforge.net> Date: Sun, 25 Dec 2016 19:39:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <47aa4314-74ec-b2bf-ee3b-aad4d6e9f0a2@users.sourceforge.net> X-Provags-ID: V03:K0:UcYosT1PW6zviin0/HMf3UaB/Wu4Hi0GgD48UnvPsU1CvY5bf+n jn2h7dGcUDQf+AHbzpru/c4pvfwMxDlrbhucfpauqEVcTSnEY9qJLJpqldolIdici4INPT+ mUrzp7vGeOWHsvW1tdEiTBmtNCJ+9iS3mjGwJCgE9xOcXw/YHyTSPOfxDOPaWqI91NS1FRO b5xU4vZ6iv5HTUaOW0oMw== X-UI-Out-Filterresults: notjunk:1; V01:K0:eVjNuDSsj/E=:yhL9J/3mziQos6YOFvV7hv hYXsJQdNJ7XuhPI1Am1h2cfDT0Ug+pCCVOdQ4CJPJK/XxsAK28pm/8eQV/6HYRqMF8fmW9AUX EoydxLrlCUtE12Scxqp0u7vFgDUBpMF/Yw7FU/2CNPxPmb5RwulGGlYi/vRbguyjDW+CoHaJY nbpCzsPi+Rz1/tvYIXVpCWlOF84ZfR2+ozc1uaqjU2kymbwphBQ2wn450JSd6f7LGAqbA3Hd3 4CNnCU+2KzmXdoGPJY3gE1mepDv3o8AHUQJYTFKVUkkqL0jSzO9O5ZAQ4utREyHgU3XFfirrO ONKQH1Umu+HhfBe9vunX204BXFLhqSCUrFx5oGFaHYwOPfYPhwk/gZAwN/1ONfO97fsu+u9BD u3B//7LnGAwfHbNHH+2Le5P9wBVxdQDF7ziKvU93f65fkDqH7FY+omMHiqUnp3uEXERBvxeiP 7lK9EjomE2+KOvP0HHvIFhMS3HhrEzPaG1Z+T7yLwOIR7gWDzw7k4F4jvQtUEANvjpNF5ghb5 EMjs+YUhRMzrK2OEdJIBVhuHvC5PWQxzIEy0Wz+yrAqc3mASCDBxNMRhGFpCaoV1rDoWO18Jr xxCPjWYLP/MJv5QI2lq80G8vYeC3PfHDsz6WqsBYIZ5l//olB+WxHYS+zYB5/GglTp9HRwR2q nBcea2SebFTN83c1VJ2m6Ww0kQzOVApiZ0MV4EeH3MoY1oYTRUM/nUKgbcjsV9bk9+++0hCuK Wcw02CfMvnPubahkoV419QeJcikpjZDJileqqurVzi0FLORjaqitXwB4V8+uRxT8OillM/Esf SzpMNXs Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sun, 25 Dec 2016 10:57:12 +0100 Adjust jump labels according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/media/usb/uvc/uvc_driver.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index f91965d0da97..c4e954aecdd5 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1698,7 +1698,7 @@ static int uvc_scan_fallback(struct uvc_device *dev) return -ENOMEM; if (uvc_scan_chain_entity(chain, oterm) < 0) - goto error; + goto free_chain; prev = oterm; @@ -1718,14 +1718,14 @@ static int uvc_scan_fallback(struct uvc_device *dev) continue; if (uvc_scan_chain_entity(chain, entity) < 0) - goto error; + goto free_chain; prev->baSourceID[0] = entity->id; prev = entity; } if (uvc_scan_chain_entity(chain, iterm) < 0) - goto error; + goto free_chain; prev->baSourceID[0] = iterm->id; @@ -1736,8 +1736,7 @@ static int uvc_scan_fallback(struct uvc_device *dev) uvc_print_chain(chain)); return 0; - -error: +free_chain: kfree(chain); return -EINVAL; }