Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2984649imu; Mon, 19 Nov 2018 09:00:07 -0800 (PST) X-Google-Smtp-Source: AFSGD/U6SdDICrP+cql2ANJqia4I0SknjHVblc0K6lwHood8gofueAUU4sKTyCKsI4h7dn+V0Sj3 X-Received: by 2002:a17:902:296b:: with SMTP id g98mr708712plb.279.1542646807809; Mon, 19 Nov 2018 09:00:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542646807; cv=none; d=google.com; s=arc-20160816; b=OPSgZs7DOE0iSpRA8JlO0rvAuF2DZD+/sh2bFIh2VBTXLUvvrFiFG2vayOZjFEf/il KUHGdPoq3s3Juw4QakKQO9JJY3GgIesWZdepNkuP8OCe0XRgeCAGZCw7SMQpBDg7ayJA NTpOLCPHtjp0Xo8jo0uBSIqQSU7xeqAhRkFsmqphzUj1gz7aDcRlxC0qTTcmatl7L7Pk NIPRuwkCMG/tF4jJQJYCONQdCZgyyLkfwJpdHx2zpoRfnoNvz4+zPPGDslbCAv7OKVaZ 3UDSGM9HawlMEyD24ASq+itL4NaXj//sej1iF21TJgC1D8W2jnL7DWBmT8bsmaFCMyun 2cTA== 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=Fp4Fb5CtinKd8f/57vdmJkOrdQhKqRLTJhHfOsQXm40=; b=m1p/i90ICbg9Gx6vku48vXeu8WYH/It9IUVD1bBWwUgoTx6frAp8WlZ3Xo/JT9u/Lm dK7QFqCEzn1ReNk5643hgr+Nf+FLcedCSJT01b65qRWVewAxQToOMVVrPGpN3kV8wHIM KO2u8UePmqoSHbCuk/7iq1pnReiHd4oGI/qT/nwQad0ExvTjl0Bxw9nMzhv0Xgn2QRL8 tGoZHC0rRWxnl+rqr+9rFSp9lx8zRtnCOporo8LToJF9jKF9Fc1eoTvLNXPKwTZoEEJ8 jUHFzx/l1ExShY32emzYeW8P5kG6PmMPBtk0m0B3WWr6P7E5K8XjzMRu8+khNvIVpBIs oqwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XbXAMSVf; 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 y20si10045031plp.415.2018.11.19.08.59.53; Mon, 19 Nov 2018 09:00:07 -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=XbXAMSVf; 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 S2405057AbeKTDX3 (ORCPT + 99 others); Mon, 19 Nov 2018 22:23:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:35506 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403980AbeKTDX2 (ORCPT ); Mon, 19 Nov 2018 22:23:28 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 B2424214E0; Mon, 19 Nov 2018 16:59:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542646753; bh=5Ey/zO5+es0ot1ptFqlEOwZSRZhRUn7c49uDpBkpHHY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XbXAMSVfA9P7yPLbX3aLEUbOQZuQmG04hKOWrvrAIUi2CcMcIKVA8sOSojWUc0gKX uT2qCqcu41baFeLH0rwCBrmYq7Db1rslmnX1Q7ijjznocJ0hcYVsKuYpsl6YsL9nYJ /ZhfjrJW62OUgemVB/SgbihTETW1cMGV4oPRCg94= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mauro Carvalho Chehab Subject: [PATCH 4.4 078/160] media: em28xx: fix input name for Terratec AV 350 Date: Mon, 19 Nov 2018 17:28:37 +0100 Message-Id: <20181119162638.781033654@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119162630.031306128@linuxfoundation.org> References: <20181119162630.031306128@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.4-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 @@ -2021,13 +2021,13 @@ struct em28xx_board em28xx_boards[] = { .input = { { .type = EM28XX_VMUX_COMPOSITE1, .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, } }, },