Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3142265ybj; Mon, 23 Sep 2019 15:39:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqwcdej5t40Di4AQweU1dWM7bxZ+tnraZVhGfckrduw8B8ebJXKrtVRsg90rwHwltYN/OV27 X-Received: by 2002:a17:907:40bc:: with SMTP id nu20mr1814124ejb.309.1569278348449; Mon, 23 Sep 2019 15:39:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569278348; cv=none; d=google.com; s=arc-20160816; b=o0uFfjZONYzaxw0Ckb6CVgakMSwFVb6SvyFX7Eu22vRmMpYFfW47pD2hbAMaUtDUA3 bImwx8Sq8AuwKCJRcL5JR3jU+CclRkeYLr4NC0Gy0+FCs1K71+JsoI/xmqRZlbT+6QqR l3Xo3B9Q5XssdgcBuxZ6Gs1SPWj++GZJVIrawMypSSxgH6mNdb1CUSapMKuftgyK0C5T nAtXqWyHlpeQxG9PEbS/o2EZFwybVuyWU76Yj9dBLHFa6EcBI3goukRyMFkzp7baGEzA Ja4gt5v9YuLOD2CuvYt0KIpe4aET8yGiK8pQLnkpXQaobzcRObYpsBPRHnNTicHV78bc mM+Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TKIUNh712b4KRjUuNU8KInAStPM8LrLcVVCypg6DDk0=; b=rh3jZbnzOGvpReh5z2ae1tS/UBHrFCYDQmqRJGrrK/zyvpVcY22bvPJGe2a7ocwhu9 aBf7xcAdgGAw5oRn/UHO9yeYiDBCVXa8pYJIG3LUgmzHHxSR5u9xixQhZYCyp9Hfyx6L N81n0XvZbG0tXlzkgpCdB36oCHFj2mPkkEClwGC1BhjpB7SDpTXdatHaJLrV4yksWQQN 0fTZZtHLUF5oq9iH9VwhbTnwZh7LUmfdsexnexsG7T5WmzfwJp3HOEX+K3d562iDI6NB dilAPeBLMxwiCRxkHaTEmNgVOovd8Uj3gN9uJRQDJne6oy30/jAzWgQ0As3WFX9j3TWU B1bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xorA9iaE; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rh27si5867450ejb.52.2019.09.23.15.38.45; Mon, 23 Sep 2019 15:39:08 -0700 (PDT) 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=xorA9iaE; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392289AbfIVStY (ORCPT + 99 others); Sun, 22 Sep 2019 14:49:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:46040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391982AbfIVStE (ORCPT ); Sun, 22 Sep 2019 14:49:04 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F2CBC21479; Sun, 22 Sep 2019 18:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178143; bh=BO2CMp99KgEKir43vyYmY/h5UcVrkGaXXS/emvzKtOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xorA9iaEn0zgcfLjVhLkGGblXYzSwwaBtiZpx27FwjKa3zjUzHJGPm4HgCCzAMzi3 y0mC88zQd77GyQVMzIjUwPXiGPi8G9oXbrWC+BPmYuCTrX1GTk/hJh1yLshNXWYd7n CJsM9hzCh6gDM9dLYlhQQ15oYmN89GP8W2xvfzz0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , Sasha Levin Subject: [PATCH AUTOSEL 5.3 192/203] ALSA: hda - Drop unsol event handler for Intel HDMI codecs Date: Sun, 22 Sep 2019 14:43:38 -0400 Message-Id: <20190922184350.30563-192-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai [ Upstream commit f2dbe87c5ac1f88e6007ba1f1374f4bd8a197fb6 ] We don't need to deal with the unsol events for Intel chips that are tied with the graphics via audio component notifier. Although the presence of the audio component is checked at the beginning of hdmi_unsol_event(), better to short cut by dropping unsol_event ops. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=204565 Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/hda/patch_hdmi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index c380596b2e84c..36240def9bf58 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2616,6 +2616,8 @@ static void i915_pin_cvt_fixup(struct hda_codec *codec, /* precondition and allocation for Intel codecs */ static int alloc_intel_hdmi(struct hda_codec *codec) { + int err; + /* requires i915 binding */ if (!codec->bus->core.audio_component) { codec_info(codec, "No i915 binding for Intel HDMI/DP codec\n"); @@ -2624,7 +2626,12 @@ static int alloc_intel_hdmi(struct hda_codec *codec) return -ENODEV; } - return alloc_generic_hdmi(codec); + err = alloc_generic_hdmi(codec); + if (err < 0) + return err; + /* no need to handle unsol events */ + codec->patch_ops.unsol_event = NULL; + return 0; } /* parse and post-process for Intel codecs */ -- 2.20.1