From patchwork Fri Nov 9 15:58:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 150678 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp23934ljp; Fri, 9 Nov 2018 07:58:26 -0800 (PST) X-Google-Smtp-Source: AJdET5chsS+v5pap1a6v1PafCOdFXyxGDM+7DpNe2/W6EVcDbmq2Jb6AvIbnYot6gaJs2v8J2Hbz X-Received: by 2002:adf:f748:: with SMTP id z8-v6mr8783933wrp.237.1541779106572; Fri, 09 Nov 2018 07:58:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541779106; cv=none; d=google.com; s=arc-20160816; b=tDkUdrbjJq973dE5GL7kyuAdPdiTjYSYRwGg+eUylVfr2R7y7xpst3sL9JF28LMAUw sexu9RzLAikEYk/bcTt3ilVi+TgSGRF4qlk4x7+U1AVbO+TjW8MtJiKCFtfacA50t6i3 OF/lvZUuN2EBduZjRweiv4aUAnnHK4GxIYIMRw3IkEuJW9Yhbw1rvLcig93vhXfoVNJp 4ccySYQ1Vq1+SnGrXBTD2i7ZL03XL4Kwyh7RrSHAiQT4D7vUSljzUfNnB2Ha0fU26J7P 6uMNFZbYYgqXb3KZ9NfHqZnUL+1zl3R/c9aIX26AesG7tETR8wuhM/UpqVatHZPzaiOY JTzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=r/JrK9bYiV1Bsp/eMmRdKT74aYgQL9f73fLUSOY9lSc=; b=imQSQf+gAuKxYfu790Y7ShZtJ/0de+/LM0hjrQeod5Ri1Pywblfg1wgf/mTcUNfTCd dsRxg5rnBsWvk7Q0L6lOT4n99tb/7qtOnMWkyE/wLJuS2ubA9JZIfxKtawUjtk5OLIrd pfKCor1p4484evJkGJYzlmOW5A8jsVRO8yb9VfB8XVGAhWvTFVKqJ0zHf6Yhi3EQ/EA1 O6kYeFW1NOJ5Y4PDMl5sqURXd9jgPyfLfKZErxr9/ErEMO8XF6uFKEUHjnpk7Glybj9D TBHFB5B6zkLs8XJEAAGeILvUwq6RUUZHOqlFoA8AHVWStVaNsNT0LuhN1W2CjBoT3WZd P9rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=J8gxstoa; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id i13-v6si7334750wro.450.2018.11.09.07.58.26; Fri, 09 Nov 2018 07:58:26 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=J8gxstoa; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 51B9D267B1D; Fri, 9 Nov 2018 16:58:25 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2F2BA267B1D; Fri, 9 Nov 2018 16:58:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id B180F267B1D for ; Fri, 9 Nov 2018 16:58:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=BFiDgHvMi+uqqPykTsmDLO4G9YfFcoXe9tG11TulpUQ=; b=J8gxstoaWZqg xG+C6H7HBcU6vsRv4cZV70s9lMEzmaxQf8xcaL1sX9vKGBmuf5ESg8ReErge0Eyzoq5yzZNJAnMdM ryvuq5zVCXpR4QAA8fYa/jAd91T5L7dhJ4uGypo0Fb1wZ/otGF/CVAWbTjCcsKeyU9wDJHx4PH4g+ GLMBw=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gL9An-0002KR-1v; Fri, 09 Nov 2018 15:58:17 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id C5B581124E6F; Fri, 9 Nov 2018 15:58:16 +0000 (GMT) From: Mark Brown To: Vasily Khoruzhick In-Reply-To: <20181109043135.26200-1-anarsoul@gmail.com> Message-Id: <20181109155816.C5B581124E6F@debutante.sirena.org.uk> Date: Fri, 9 Nov 2018 15:58:16 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mylene JOSSERAND , Kuninori Morimoto , Maxime Ripard , Takashi Iwai , Liam Girdwood , Chen-Yu Tsai , Mark Brown , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] Applied "ASoC: sun8i-codec: fix crash on module removal" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: sun8i-codec: fix crash on module removal has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 278df5e5527b633f4882f1680ad58b62a7c07bfe Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Thu, 8 Nov 2018 20:31:35 -0800 Subject: [PATCH] ASoC: sun8i-codec: fix crash on module removal drvdata is actually sun8i_codec, not snd_soc_card, so it crashes when calling snd_soc_card_get_drvdata(). Drop card and scodec vars anyway since we don't need to disable/unprepare clocks - it's already done by calling runtime_suspend() Drop clk_disable_unprepare() calls for the same reason. Fixes: 36c684936fae7 ("ASoC: Add sun8i digital audio codec") Signed-off-by: Vasily Khoruzhick Acked-by: Maxime Ripard Signed-off-by: Mark Brown --- sound/soc/sunxi/sun8i-codec.c | 6 ------ 1 file changed, 6 deletions(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index 522a72fde78d..c4196d4e5915 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -605,16 +605,10 @@ static int sun8i_codec_probe(struct platform_device *pdev) static int sun8i_codec_remove(struct platform_device *pdev) { - struct snd_soc_card *card = platform_get_drvdata(pdev); - struct sun8i_codec *scodec = snd_soc_card_get_drvdata(card); - pm_runtime_disable(&pdev->dev); if (!pm_runtime_status_suspended(&pdev->dev)) sun8i_codec_runtime_suspend(&pdev->dev); - clk_disable_unprepare(scodec->clk_module); - clk_disable_unprepare(scodec->clk_bus); - return 0; }