From patchwork Sun Dec 25 18:37:59 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: 9488291 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 CA6EE60471 for ; Sun, 25 Dec 2016 18:38:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2DA41FF65 for ; Sun, 25 Dec 2016 18:38:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7C3E21F61; Sun, 25 Dec 2016 18:38:30 +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 6DD5D1FF65 for ; Sun, 25 Dec 2016 18:38:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753880AbcLYSiL (ORCPT ); Sun, 25 Dec 2016 13:38:11 -0500 Received: from mout.web.de ([217.72.192.78]:62144 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753345AbcLYSiJ (ORCPT ); Sun, 25 Dec 2016 13:38:09 -0500 Received: from [192.168.1.2] ([77.182.80.223]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Lj2QM-1cyPqe1nmo-00dDMN; Sun, 25 Dec 2016 19:38:02 +0100 Subject: [PATCH 07/19] [media] uvc_driver: Rename a jump label in uvc_probe() 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: Date: Sun, 25 Dec 2016 19:37:59 +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:YN9aaTfE13hc9Vb7GW14Yh+4iK6R/fmjUeS8SCKh4M3oSomXSVJ PIu6qbD6TLIwPds3WvRTK3QcCDyceerQF2nPEFWf+DYRP1tdiuJ8iEdeoM2gFKza/boQ5cg s9jvu3k57eUYKYba4kIBsPV3o1HmIDwe2QZcnAyRxJpEiUkZI3LUL8v1rGg3oPLeiuqaQnv ee9ex9xSDmGdLR1HoL88w== X-UI-Out-Filterresults: notjunk:1; V01:K0:XkwQdwTCo68=:fTrSleLZdDsiiQihKXIt8r xJIC5HlfELcXCUEF5Z+FPjz2dwwtsvu8lt4WrI150KzEWokqoR0LyFHys3XV5NwBN+nyOfMOT agCVHdtUhl6qL1cNYkFEMm8PQ0rW1iciqkZY2f8jaVBZeA3jo822aWBb0H75/WWgIYfrOPaQf bFf6lSb8t30HekLwBm7WySHYYENeTAxxdZU/Lj9/5StjpZ+QDErGBSgRI8jAkJnE6OTIGh2sp 8xCZADaYsP2m3OvrkWMzXmbNfY2LREdbCD5Cwm7+Y2b1PLtsN8x9efRravamJsuQTV4ye+vwQ 2eSj0hn93Bj5l7YwW55sg5EFlRd4TPWok8JmiD/Vj0WvydYeCG7ImKJxkoLeV+xxcuE7KwlVI wDnEnpYN4Xsk4DEzblPHDs4FfRfw0cnoe4FK0k+MkWc7hvFa9Mwk9gVJpaV3UW+LvY+ye5DTI 8cFGkHSxYZHie5wJFY1Wptylgzp5sJ+fg2QQyUwn07MmlV2gWlofFPdq6CAEL+fhib6+aaSHk cE0W5zT2oxxAWYzySeu4luc+FLW7zf26cTVoS8WhxawoarTeCuqxArh2EYZWyu+dq2K3hfeGU xlXFoDmgJRLwEVj5jTfsq37PvxHseNdILZrB+cMS6QHzlqwMPKD2Z/HJebIIyGONSR6cCdjJb pRW2EUcl/JmqSZuPbbRitBmFVdTOy70qupG28jphOnPlupzWWJJIaOb1eJhkb/RQIMRev7gOp fxcVH2swoHggrQRc17B4g7FgSotLTIpGeqziq8kfeTCwuTnnZ98Bg3gQl5iywvB2/unXDERTL Ig2fmyE 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:54:15 +0100 Adjust jump labels according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/media/usb/uvc/uvc_driver.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 563b51d0b398..f91965d0da97 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2060,7 +2060,7 @@ static int uvc_probe(struct usb_interface *intf, if (uvc_parse_control(dev) < 0) { uvc_trace(UVC_TRACE_PROBE, "Unable to parse UVC descriptors.\n"); - goto error; + goto unregister_video; } uvc_printk(KERN_INFO, "Found UVC %u.%02x device %s (%04x:%04x)\n", @@ -2092,24 +2092,24 @@ static int uvc_probe(struct usb_interface *intf, dev->vdev.mdev = &dev->mdev; #endif if (v4l2_device_register(&intf->dev, &dev->vdev) < 0) - goto error; + goto unregister_video; /* Initialize controls. */ if (uvc_ctrl_init_device(dev) < 0) - goto error; + goto unregister_video; /* Scan the device for video chains. */ if (uvc_scan_device(dev) < 0) - goto error; + goto unregister_video; /* Register video device nodes. */ if (uvc_register_chains(dev) < 0) - goto error; + goto unregister_video; #ifdef CONFIG_MEDIA_CONTROLLER /* Register the media device node */ if (media_device_register(&dev->mdev) < 0) - goto error; + goto unregister_video; #endif /* Save our data pointer in the interface data. */ usb_set_intfdata(intf, dev); @@ -2124,8 +2124,7 @@ static int uvc_probe(struct usb_interface *intf, uvc_trace(UVC_TRACE_PROBE, "UVC device initialized.\n"); usb_enable_autosuspend(udev); return 0; - -error: +unregister_video: uvc_unregister_video(dev); return -ENODEV; }