Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3428297imu; Sun, 11 Nov 2018 14:53:21 -0800 (PST) X-Google-Smtp-Source: AJdET5eVMm7Se7i9ivyUwoaBYq86bFtE2Iimgn/xeHgQYROXc2aSWLNrqoQhIICb0QaQ/ZT5rYYv X-Received: by 2002:a63:554b:: with SMTP id f11mr5763238pgm.37.1541976800953; Sun, 11 Nov 2018 14:53:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541976800; cv=none; d=google.com; s=arc-20160816; b=AjGAqHUvyVw8ioUi3DYD1QDy9eAoDVAI5vQPc9tkfwXbnsgs6XWp1ziqr/Ig1OxDGa 35pFtBwjKATe6rQzgn/C4UlI8gpo80FtNVJAQOJ4cn+LE37EvODVDkGInqnFzbG8ksdy dpnKc6Y6Zy8IJyw8ejUTHfGtSTbF6WJocFxP+Y/gnK15bkIn6B2f6wO028u2pdscj++n py1aEqXBjhP17ApP2KljAjhd9454M2OH6VZ1mriQfyjjIxc+6qJBnoQlju3e5kjDDmbB gSiYE4cSlNY0fbpHcVD+jBmajoVG7UkCYfDI6YpJIg/bbX7cghya3xUt9zBk1q0d5So/ DeiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bfq/LkS8tR6o1kbxnLROpW/YYDg5zvt8/J4Ha/bLNS0=; b=NPEd27Iik8mkzYszBoUtI34QTqlJMWZsI+t9iAVOVf4zza2d2BOA+K+WP3PuQzRLV9 VCwOyUv3T7jKTmA2YlGzKAGw9Rn2gM/1/bKTJ5Pfeenab4fh6R9cFd6/IDfZUWQCgedi O/Amh6eCLikrKaONnaKlzhln9lmBcXy+eV//D4sXdIbgxbS4lM6vH6/nACTs27GwLrTD pdfu4j9uC1BRIzDSFOXx8Fkn4zko2v225VGG65irLMUh/Sp4C7bcTQ0vPT3RdBcf4oZh TtKgGdTDeprR8AK9RpXB2CkkT5PG/d/ZxS/RHH8LIInGtAkub5mB1Fj5mQtfEgnu2MQZ irRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fUEgX5WH; 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 c19-v6si14153149pfb.81.2018.11.11.14.53.05; Sun, 11 Nov 2018 14:53:20 -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; dkim=pass header.i=@kernel.org header.s=default header.b=fUEgX5WH; 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 S2404081AbeKLIXE (ORCPT + 99 others); Mon, 12 Nov 2018 03:23:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:55548 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389838AbeKLIXC (ORCPT ); Mon, 12 Nov 2018 03:23:02 -0500 Received: from localhost (unknown [206.108.79.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EE7712241B; Sun, 11 Nov 2018 22:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541975585; bh=aPv9tsFmxPjvHI3uccIfA8+NsyDsdnUim0S1WqQnFkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fUEgX5WHsB8axRHM3wep+X7C+6vuAX2KAsZT3MyiqLO6z8n2PDcIwmDjyY/tTiDtF q1cyeyjkYY1nNPOTDov35PPU2NkaXJRuNdkVDQvMjBcE8W+OWzCtvQL6DrXji/Xzo7 h+FPscKY1EbMeiTuFCna4wIlcEujUfpUBUq+/9tU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mauro Carvalho Chehab Subject: [PATCH 4.14 186/222] media: em28xx: fix input name for Terratec AV 350 Date: Sun, 11 Nov 2018 14:24:43 -0800 Message-Id: <20181111221703.605409179@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111221647.665769131@linuxfoundation.org> References: <20181111221647.665769131@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mauro Carvalho Chehab commit 15644bfa195bd166d0a5ed76ae2d587f719c3dac upstream. Instead of using a register value, use an AMUX name, as otherwise VIDIOC_G_AUDIO would fail. Cc: stable@vger.kernel.org Fixes: 766ed64de554 ("V4L/DVB (11827): Add support for Terratec Grabster AV350") Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/em28xx/em28xx-cards.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -2112,13 +2112,13 @@ struct em28xx_board em28xx_boards[] = { .input = { { .type = EM28XX_VMUX_COMPOSITE, .vmux = TVP5150_COMPOSITE1, - .amux = EM28XX_AUDIO_SRC_LINE, + .amux = EM28XX_AMUX_LINE_IN, .gpio = terratec_av350_unmute_gpio, }, { .type = EM28XX_VMUX_SVIDEO, .vmux = TVP5150_SVIDEO, - .amux = EM28XX_AUDIO_SRC_LINE, + .amux = EM28XX_AMUX_LINE_IN, .gpio = terratec_av350_unmute_gpio, } }, },