Received: by 10.223.185.116 with SMTP id b49csp1130195wrg; Fri, 23 Feb 2018 12:27:54 -0800 (PST) X-Google-Smtp-Source: AH8x2260Hsj91tdhhfTTSnys0o787WRijVuLr+6esZD20zd0FarOoW857ubG1tTcBzDpNSuXvAiM X-Received: by 10.99.183.68 with SMTP id w4mr2348323pgt.221.1519417674201; Fri, 23 Feb 2018 12:27:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519417674; cv=none; d=google.com; s=arc-20160816; b=1ENMqmE4/VQHjfqfZs4cEbMEx6UNGVUPi33pO/GK2/VTSW2wl71dTd+OMke1FAWK9K 2WXz3iCVdo0n1iTPe4r/f13+Pvv1rkt5nXXPgystzmgnsGWv4TJiW6TjZWyiRjz7F9Vh OH8of7jwhMNjkfX/WskLkkep4hnrQGsxK830BK9b+DT3NMUtr8Ia4IdVDqEUWHzZjyrI uApisvH9Cv1ymOFWzDwFr/p81Nu+ohmgT9OIGTKb18I6b73yweAJXD2+8jbGpZmL0oyC w6xtZwwS2t81LOmEtyvuvaqo/LTUM0I4p5aKoVVbifioUWR1q9d82n9PlTOkUNf75QTX jPGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=H6UWWE6pLqwS697KJqIkvISnstSRHnofn+nQfzfqbOw=; b=gMFUZ7xQ6YGeEQcvZaVowHm5o7+ofv6jYTykzZGkhSeVFxcFXqjEswLtM+u+FfLZsP dnPEdwcs6fKQnsj+prD4SVb/ZRrRwJv/dgE8j3SpAV2JrTyDnMZYv8mnWoMjJ0sHsl/s 5kg6k7n5qkKB0Hba/KtXV9mMeYI+P+U5tNUWR4ZO9GoA+vPXifWx1zbWbF4Ed9WySVpG iRrOi/lKRNh96HD6fyxWBGaWlUpUcXqpb5zpQR+9n66OEOsMYuPblGHb4PsR8yJtABP8 v1Wquq1u1H3NTL/VeU4WflfHpam2ls/rV3rjhIHyxMhtWTsp4l4cPWAxkFhYC63ttY7y WQcg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r13-v6si2339632plj.141.2018.02.23.12.27.39; Fri, 23 Feb 2018 12:27:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754203AbeBWShV (ORCPT + 99 others); Fri, 23 Feb 2018 13:37:21 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:38652 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753303AbeBWShR (ORCPT ); Fri, 23 Feb 2018 13:37:17 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 47AE2BBF; Fri, 23 Feb 2018 18:37:16 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 4.4 099/193] [media] pwc: hide unused label Date: Fri, 23 Feb 2018 19:25:32 +0100 Message-Id: <20180223170341.503291949@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170325.997716448@linuxfoundation.org> References: <20180223170325.997716448@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann commit 1f6bcd011464cb36059e2562f72baf75f98b732d upstream. The pwc driver causes a warning when CONFIG_USB_PWC_INPUT_EVDEV is unset: drivers/media/usb/pwc/pwc-if.c: In function 'usb_pwc_probe': drivers/media/usb/pwc/pwc-if.c:1115:1: warning: label 'err_video_unreg' defined but not used [-Wunused-label] This moves the unused label and code inside another #ifdef to get rid of the warning. Signed-off-by: Arnd Bergmann Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/pwc/pwc-if.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/media/usb/pwc/pwc-if.c +++ b/drivers/media/usb/pwc/pwc-if.c @@ -1119,8 +1119,10 @@ static int usb_pwc_probe(struct usb_inte return 0; +#ifdef CONFIG_USB_PWC_INPUT_EVDEV err_video_unreg: video_unregister_device(&pdev->vdev); +#endif err_unregister_v4l2_dev: v4l2_device_unregister(&pdev->v4l2_dev); err_free_controls: