Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3116966imu; Mon, 19 Nov 2018 10:52:47 -0800 (PST) X-Google-Smtp-Source: AJdET5f/mhW5C5hgFVUCd6QYZFeK6uUg8WC1eP1rgwpZZGWKTwxqFBGYbUwGduZM0idTLYdylgal X-Received: by 2002:a63:d547:: with SMTP id v7mr20807419pgi.339.1542653567034; Mon, 19 Nov 2018 10:52:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542653567; cv=none; d=google.com; s=arc-20160816; b=fIYCzlNSSxSUKTZUtkEydVgloKqu0P+YZiQDIZ/J6AgLPmlPY/o7uuZXSSmxU3KH2H Y2My1qShNydUuJWgMF+N/Dc1IKfww/wbX4tylzS8bt9cyakMuDSDoYbNI74LkmJ4boy6 GWxBYlszbwHmDbHcIdkUTbFzuXxst+3wiDHKRG5rr41065/Yo/6hZmHiqleFt5mUdktJ 6mOZZ2nfReJTuVVet87RxOR44tCHc+aSczURWoUBtm+b6kvkaOGUwGULQoqTiDpjua+b 7mpgU1uOtnQqytrlPhpubz25l3onh6cn1an/aKNaaFiiMwi6b2C4P49Qzq+fNeyiLyZd pWEQ== 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=hha8B2F6ASIanu3NG+JaOtcgX+7UMrbjenxnvjUZivA=; b=mkHvRxir2ifNqzh8VwUEuxTJCdEpOJhhU+7gYePDw42zJBUrlxoil1a6+21+HM4seA 5IXiQBmoXb2tgjOfl0AWdM4Gxc1BCaD0zljptMBIuFJmXpI54S5kqzkw723LAF73DFAt Su46vnvL+qdTC7Dh0WNJ5CixOCxXWwm9B7EbAUgnddCJUkMzNIaBJKb41uPk7ptkjQGe NIggNAKSlpDMJ1I5kmG93kONbZ133WkP/FtwiK57X/OVR2YbGIfFjwZ4gSejaAdrxP16 pFDZQkX41mNgQulsiHyIpjAAwLu51JqAhCt/olXCIRybVY71PAlqyT0lyaTx5xFUJtlP h3og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cv1ZCNJl; 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 g62-v6si8176433pfe.186.2018.11.19.10.52.31; Mon, 19 Nov 2018 10:52:47 -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=cv1ZCNJl; 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 S2406707AbeKTD3S (ORCPT + 99 others); Mon, 19 Nov 2018 22:29:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:43930 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405697AbeKTD3R (ORCPT ); Mon, 19 Nov 2018 22:29:17 -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 DFDD42148E; Mon, 19 Nov 2018 17:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542647100; bh=D4Q7lUKRIaB3gm7l76vFCcBCP43h3MWlLOT41zQAgrs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cv1ZCNJl9qMMOE0EP9FxavhYQZ3M0pGJjRDZ2ih5QKqoGe91UnI95PPqi9vA+hiHQ KZiJfsPojFtczD4u2XZ6bnTA+g8INZ+XTY3MC84DUYUvWdzPRG74kzuPvGL+kudzte 7vZT7fU6lIvN7Soi8fQMx8swetO13jEK/s0pGodQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mauro Carvalho Chehab Subject: [PATCH 3.18 50/90] media: em28xx: fix input name for Terratec AV 350 Date: Mon, 19 Nov 2018 17:29:32 +0100 Message-Id: <20181119162628.905420843@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119162620.585061184@linuxfoundation.org> References: <20181119162620.585061184@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 3.18-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 @@ -2001,13 +2001,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, } }, },