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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,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 119FBC072B1 for ; Thu, 30 May 2019 04:55:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D531825F0B for ; Thu, 30 May 2019 04:55:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559192143; bh=PD2AYPz817jElRbCQweCXOfi52cb+0RkBa5KHvCc86A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cq+viI1rbP36OAwlHhvZ13Xldo7HRMIHGUYmkvjHX4g2kD4ZHxLJr7SxzKRd7ohES 1rg7KwijENfKqBEflewf8rhIDSuFamWDJZyURsK0HE1dgDr74wDC9VaHhHWMeqWBK/ wEOyWXNi1WhGOKDUgEJC3ka2jwriaF4W+2eNcBoI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388966AbfE3Ezn (ORCPT ); Thu, 30 May 2019 00:55:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:46760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727996AbfE3DKO (ORCPT ); Wed, 29 May 2019 23:10:14 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 A17BC244BB; Thu, 30 May 2019 03:10:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559185813; bh=PD2AYPz817jElRbCQweCXOfi52cb+0RkBa5KHvCc86A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iPTIKL1oaW9V4hQUzux+TGY98ypv9w9wPjPqPFblQaDxuNZpdUYJnhZcOKeIGm+65 UxZsvqad3ofS4YUnyYdKVPYnVW/Ads2cyPFwbaeKTqKDB1lkdxhK/4WGsOVAxX3p+8 NLnQuAthaiL+hF46H/bnal/IjHPudTxB1zZgsUSU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bard liao , Takashi Iwai , Sasha Levin Subject: [PATCH 5.1 104/405] ALSA: hda: fix unregister device twice on ASoC driver Date: Wed, 29 May 2019 20:01:42 -0700 Message-Id: <20190530030546.277528476@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.291644921@linuxfoundation.org> References: <20190530030540.291644921@linuxfoundation.org> User-Agent: quilt/0.66 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 [ Upstream commit 4d95c51776b2edb4d4ebcea00b6e5a1fe538ce66 ] snd_hda_codec_device_new() is used by both legacy HDA and ASoC driver. However, we will call snd_hdac_device_unregister() in snd_hdac_ext_bus_device_remove() for ASoC device. This patch uses the type flag in hdac_device struct to determine is it a ASoC device or legacy HDA device and call snd_hdac_device_unregister() in snd_hda_codec_dev_free() only if it is a legacy HDA device. Signed-off-by: Bard liao Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/hda/hda_codec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 701a69d856f5f..b20eb7fc83eb2 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -832,7 +832,13 @@ static int snd_hda_codec_dev_free(struct snd_device *device) struct hda_codec *codec = device->device_data; codec->in_freeing = 1; - snd_hdac_device_unregister(&codec->core); + /* + * snd_hda_codec_device_new() is used by legacy HDA and ASoC driver. + * We can't unregister ASoC device since it will be unregistered in + * snd_hdac_ext_bus_device_remove(). + */ + if (codec->core.type == HDA_DEV_LEGACY) + snd_hdac_device_unregister(&codec->core); codec_display_power(codec, false); put_device(hda_codec_dev(codec)); return 0; -- 2.20.1