Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3471613imu; Sun, 11 Nov 2018 15:52:54 -0800 (PST) X-Google-Smtp-Source: AJdET5fvREBHeLa+N33vtLyziW9fmmWbzdJYUrgLJmFFmWFmH24pl5WtXYg3Nko9LhSGhJSKnvY8 X-Received: by 2002:a63:2141:: with SMTP id s1mr13014028pgm.148.1541980374385; Sun, 11 Nov 2018 15:52:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541980374; cv=none; d=google.com; s=arc-20160816; b=tWdHzk3eMGlOgHAaunN7i6r38CPXwUIWbl7cHsZaDNVT4ZBIoizcahvpuYnTxLNxo4 xqrkQ00x9i3pNsEbvbUlSQIrSIexI5uOa1wwHa6gBH/IOs57cPNhN7isZsefEs0q0nP2 nq4ErbK2RIxw3jd7KLSOoGGyqe38+RE39BUlr0PXG9RZcix3m44EQMqv6hGqBwEiA4S+ DMq8/y2PXEOmDpnoFMn9l03E73BAr60VEZyqrxS5a42XIw5FQULXeaICq4rD5A+c2kXD oZe808FKcyj9w7FQpp1N4tnLvWG90L5doQfMMkJBRnuTG+Q1ajYw4Ahu/60HRnHG39VK yogA== 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=opU1X7H1WLFQ+4HCJasLZOEM1QHRM2jKRpHYiMxji3A=; b=OmOvuFi7vgp3fN93RwUnKlpfXFk7kV8/7n5c/oYdc3o+hQnyOrlPvCL35wIcM3f2BM PyJWTK6yMUxpwOoTQgKtBEngd2Ne8GymrOZivjtfaD+6s/WU8t2E+8JHp28fqqAAtRno GpXgR9dBaPwpGJnITw70Ro/XNg8aslUFMT4TP2zKwNWkrzsF/bsB8xI9j9XWbzWA4bAP sYJmc+IoXMI33pW51mqS5kdOARy+0ahI2k3Lfx3vjM8PiZYNRZcHlvTEwxSTJji8zwHb mspiHh0eA9g+/5Z33BskmmAhLFq00z4ZLun0kEYH0A8jp+0YCCoq2ya/+TDM9sG2bvYn qbeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vFqlZYTx; 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 59-v6si4723685plb.75.2018.11.11.15.52.39; Sun, 11 Nov 2018 15:52: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; dkim=pass header.i=@kernel.org header.s=default header.b=vFqlZYTx; 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 S1733147AbeKLJl3 (ORCPT + 99 others); Mon, 12 Nov 2018 04:41:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:38130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732843AbeKLISc (ORCPT ); Mon, 12 Nov 2018 03:18:32 -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 005142175B; Sun, 11 Nov 2018 22:28:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541975317; bh=zaGNLJSV1NZbRFQdVaENuetBPttOjU9UjZfR7YTFgBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vFqlZYTx39ZksDN/AC1y3oEmDw5mxpQpG3Eq606/i7kVwk31Hwa4r2Tk5W4rrc9Mc Q66t/cWx6IzNJ84jMjj/cyuuOruKoWVTH1VtfG1sKJsv2UX/rWdzpOytPt2ophOF2Y bABB5H9oCiNa60xuD7/baWbYJe7b2xuDffnljzUo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mauro Carvalho Chehab Subject: [PATCH 4.19 307/361] media: em28xx: fix input name for Terratec AV 350 Date: Sun, 11 Nov 2018 14:20:54 -0800 Message-Id: <20181111221657.969758598@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111221619.915519183@linuxfoundation.org> References: <20181111221619.915519183@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.19-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 @@ -2141,13 +2141,13 @@ const 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, } }, },