From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAA24C7618F for ; Mon, 15 Jul 2019 14:24:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A46C12053B for ; Mon, 15 Jul 2019 14:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563200687; bh=RfVDrJpsJKpwiVY8k4QW2bGJXT18S5pqM0WX57jOKok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RBO/ywI9fXyh8J+XEyC0gc3BGrTZwTTfnZqJ6NqRgYtOjSCCHPvELZ46QVBIqXTMx 0DMOMmIBdw+ZDhSmTJIkOQ9LP89e2j/DUTLfHnB8x/57M7znqgfrybP+tdYnnU1T2w /lOk/b01Le2X5swybXDU+t6aZ918VZU3uNgFsPNc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390956AbfGOOYq (ORCPT ); Mon, 15 Jul 2019 10:24:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:58772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390248AbfGOOYp (ORCPT ); Mon, 15 Jul 2019 10:24:45 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.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 371782053B; Mon, 15 Jul 2019 14:24:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563200684; bh=RfVDrJpsJKpwiVY8k4QW2bGJXT18S5pqM0WX57jOKok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DWsZUGWD8qA7sHS2ICIic8YU+tLVzXav/M+2HNgKEZul0Be83XDDUaBGcwvIoBMHb CoxAlKD33S/daRqL2ZsGPzj/emkfktFdE25q40mC6KMkfkIR0q6onpKMFTiYcP5AAv kbAdv5WEhRMhWWIHK3+n2NLLr3DEpi1YpXQ4T4uk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= , Pierre-Louis Bossart , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 4.19 111/158] ASoC: Intel: hdac_hdmi: Set ops to NULL on remove Date: Mon, 15 Jul 2019 10:17:22 -0400 Message-Id: <20190715141809.8445-111-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715141809.8445-1-sashal@kernel.org> References: <20190715141809.8445-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: Amadeusz Sławiński [ Upstream commit 0f6ff78540bd1b4df1e0f17806b0ce2e1dff0d78 ] When we unload Skylake driver we may end up calling hdac_component_master_unbind(), it uses acomp->audio_ops, which we set in hdmi_codec_probe(), so we need to set it to NULL in hdmi_codec_remove(), otherwise we will dereference no longer existing pointer. Signed-off-by: Amadeusz Sławiński Reviewed-by: Pierre-Louis Bossart Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/hdac_hdmi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 63487240b61e..098196610542 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1854,6 +1854,12 @@ static void hdmi_codec_remove(struct snd_soc_component *component) { struct hdac_hdmi_priv *hdmi = snd_soc_component_get_drvdata(component); struct hdac_device *hdev = hdmi->hdev; + int ret; + + ret = snd_hdac_acomp_register_notifier(hdev->bus, NULL); + if (ret < 0) + dev_err(&hdev->dev, "notifier unregister failed: err: %d\n", + ret); pm_runtime_disable(&hdev->dev); } -- 2.20.1