From patchwork Wed Jan 8 11:50:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 182794 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp3210024ile; Sun, 12 Jan 2020 09:53:12 -0800 (PST) X-Google-Smtp-Source: APXvYqzWwy9cvJ6NDxSKJlC3LegPJoyS9LpX3UDDo/ed3ZX5cTDRALMFrI3A7aC4vib6bWB4cg0R X-Received: by 2002:a1c:9602:: with SMTP id y2mr15499908wmd.23.1578845270841; Sun, 12 Jan 2020 08:07:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578845270; cv=none; d=google.com; s=arc-20160816; b=j+grUd7IdZE9R3bFJNq4DZctAXFHHaBFT82DsO6aBzwKHsJWNMM4aqdjtK/MALlRNR dJwVyh5mD3wowUHL540gHYeJQvmleRT1E03hlhYmaHIrXCJxbkF0LhDBd2N0g13ut7wY lIqWtUScvq0PeQgatKQ+9R3Zh6cJBK86aqkF2/yj0HcO/VCi48wNYIPE9zQ+WG2nolgi 9FYZXenSkYqyvt7axaOYhSve8cQDnaHOSCqxjrZD9VOv6tuD0gOJLtwMPrwezoVtNl1I GZW6wZ/oJ+Pk5m2yg9QHi8apBBHt/f2xHpR+TyBFu7FNNYvtKpGsuv8y8HzoKA3WyGV1 gzow== 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:references:cms-type:message-id:date :to:from:dkim-signature:dkim-filter:dkim-filter:delivered-to :dkim-signature:dkim-filter; bh=NRFhqgIeMGzaFVpa0FbaMG9+eVZbOcCRL1QrTmanaoA=; b=kg8qkEpppHTCkCHHarZKoy6yEMQzSwO8hS1N5P4HGjY2/w9xzK2/1oYz7wHlB7ZJJG mlrzMdsfIxhtYaRZEMjsaDIHEOPmPuFLSUZqXHmJAKu55j618y3tErUflBJK30dehg5n WkRFh/s5DndTHIHz0HNPKED11sh+5f1fUXlccK3KfzOJ/XdFTzPLPcdGNYrRnmTdb/Go M9vlma8xzrCNG+XWrGHtPnl5GhecnBaVXZruKjQARF4VAXlCs9KxgQXK0njOAGOr8cPM sc0jWphf4WWYRrjOg7LVkJEr0/hPTK/JJoqWxlazOfluN06LAZsOfTKW99yMj5bzDAxY KKrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alsa-project.org header.s=default header.b=TUADShVX; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=BAGd9+Gp; 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=samsung.com Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTPS id e9si7796124wrm.513.2020.01.12.08.07.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Jan 2020 08:07:50 -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=pass header.i=@alsa-project.org header.s=default header.b=TUADShVX; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=BAGd9+Gp; 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=samsung.com Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 5EDCE171B; Wed, 8 Jan 2020 12:50:35 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5EDCE171B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1578484285; bh=o3upuEFLMKjmDc45dbUO4zO8mfiNViMU5bp3W/WiNHM=; h=From:To:Date:References:Cc:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From; b=TUADShVXPaM6I9RHBPuV+i5CqAsZYgkJ78fPDtF8Im1/OEKY5iWC0ahW89dUWaSo9 R1UvR2WdapzgSWZuauIhBlQ+XfxFnsq2CRRFK4OwQQyCph+AGszw/9lDIr7AGFil0k atZw5lgHfQ/U44JZ++4VcadE/atFCoODYKV+dfZM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9DB61F80149; Wed, 8 Jan 2020 12:50:34 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 08521F80161; Wed, 8 Jan 2020 12:50:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, SURBL_BLOCKED, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2D318F8010A for ; Wed, 8 Jan 2020 12:50:28 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2D318F8010A Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="BAGd9+Gp" Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200108115027euoutp0141a06d3e359cda322994782d3b7a793c~n5wrFFT4y0543405434euoutp01H for ; Wed, 8 Jan 2020 11:50:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200108115027euoutp0141a06d3e359cda322994782d3b7a793c~n5wrFFT4y0543405434euoutp01H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1578484227; bh=3OyRPuFqCIRdzwH2FYDtdhnfPsBECJGMdvkxFH7m2yU=; h=From:To:Cc:Subject:Date:References:From; b=BAGd9+GpbtxPozyM4oukg80FyFdXjt5mYG6eW4cftmjYb2L/0Xw4m15L2bNdqjZnu //3gnXgfcuDsC1iX+DUBuDDG4xf3DuokfQ5DP6fZP6cIlFl7BbdQEss0dl2vpLmaDH ijRa5fPOe/voAuA9UPYvZiQeKI2Ghqx1jK6MzR/w= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200108115027eucas1p2d11eb4dc1d466e7dbd0b1b36075e8d9e~n5wq0UHpk3212532125eucas1p2k; Wed, 8 Jan 2020 11:50:27 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id C6.03.60698.302C51E5; Wed, 8 Jan 2020 11:50:27 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200108115027eucas1p2abcd40e359e993e5b471229b02b69fc3~n5wqaRcR22915229152eucas1p2G; Wed, 8 Jan 2020 11:50:27 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200108115027eusmtrp28c6e206ae88bd77a88adeee8520cd1e0~n5wqZmVEb1831018310eusmtrp2Z; Wed, 8 Jan 2020 11:50:27 +0000 (GMT) X-AuditID: cbfec7f5-a0fff7000001ed1a-23-5e15c2035f05 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 5E.A4.07950.302C51E5; Wed, 8 Jan 2020 11:50:27 +0000 (GMT) Received: from AMDC2765.digital.local (unknown [106.120.51.73]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200108115026eusmtip16de4a492f67213a17e0ad1e60bd5ff50~n5wp4ZlIZ1983219832eusmtip1U; Wed, 8 Jan 2020 11:50:26 +0000 (GMT) From: Marek Szyprowski To: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org Date: Wed, 8 Jan 2020 12:50:06 +0100 Message-Id: <20200108115007.31095-1-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42LZduznOV3mQ6JxBrfXKVpcuXiIyWLjjPWs FlMfPmGzOHG4kdmifWYHo8X58xvYLS7vmsNmMeP8PiaLtUfuslscftPOarHn4it2B26PDZ+b 2DwWbCr12LSqk82jb8sqRo/Pm+QCWKO4bFJSczLLUov07RK4Mrrab7EX/BWsmPWhmamB8Sh/ FyMnh4SAicTjB7vZuxi5OIQEVjBKLPjbxwjhfGGU6H83ByrzmVHiYvtGNpiWE3c3MUEkljNK /DgwgxEkAday8q4KiM0mYCjR9bYLrEFEIEni/ILbzCANzAKXmSRWN/YzgySEBeIk7u9+ANbM IqAqcar9H1icV8BW4trXjUwQ2+QlVm84ANYsIfCZTeL09qdQZ7hIbD2zggXCFpZ4dXwLO4Qt I/F/53wmiIZmRomH59ayQzg9jBKXmyBulRCwlrhz7hfQJA6gmzQl1u/Shwg7Siy4vAssLCHA J3HjrSBImBnInLRtOjNEmFeio00IolpNYtbxdXBrD164xAxhe0jseb6NBRIosRIzz75gncAo Nwth1wJGxlWM4qmlxbnpqcXGeanlesWJucWleel6yfm5mxiBSeP0v+NfdzDu+5N0iFGAg1GJ h/fHYpE4IdbEsuLK3EOMEhzMSiK8WjpAId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rzGi17GCgmk J5akZqemFqQWwWSZODilGhhr1/0Qdt/nnxaxRP6Z9Kfzh0r/5DgrvUo4orD6aedmjm/q95LV 252uMJtHdK6q0jywrJCr6WLt9tIF3av2iH2bc3RK1sR9HyLX8Ha2zxJPFfATNnz5377+4ZoX f1nE9Pk2uEr8ZmS4+DXhw3Q2tqVfFxn9KHnpf+2Zr3NpxrwzTnIv7nIHFm1RYinOSDTUYi4q TgQAZc1IfBYDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBLMWRmVeSWpSXmKPExsVy+t/xu7rMh0TjDK70slhcuXiIyWLjjPWs FlMfPmGzOHG4kdmifWYHo8X58xvYLS7vmsNmMeP8PiaLtUfuslscftPOarHn4it2B26PDZ+b 2DwWbCr12LSqk82jb8sqRo/Pm+QCWKP0bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1j rYxMlfTtbFJSczLLUov07RL0Mrrab7EX/BWsmPWhmamB8Sh/FyMnh4SAicSJu5uYQGwhgaWM EneeG0DEZSROTmtghbCFJf5c62LrYuQCqvnEKLH8cycjSIJNwFCi6y1IgpNDRCBF4ueMdYwg RcwCN5kkfixezgySEBaIkehe9gJsEouAqsSp9n9gcV4BW4lrXzcyQWyQl1i94QDzBEaeBYwM qxhFUkuLc9Nzi430ihNzi0vz0vWS83M3MQJDdduxn1t2MHa9Cz7EKMDBqMTD+2OxSJwQa2JZ cWXuIUYJDmYlEV4tHaAQb0piZVVqUX58UWlOavEhRlOg5ROZpUST84FxlFcSb2hqaG5haWhu bG5sZqEkztshcDBGSCA9sSQ1OzW1ILUIpo+Jg1OqgXFhsGfksr/i+Un/p7pMUr30jUk1uqv0 9G8Tt9T/3CVG6yPs7ebys6S05L1YrJqc2Zy26+KieG8JNk+Fjz+rMk7dyXEP7Hh4wufA78dm z97fyvL/fUnZ8+ydB2ysN+bxq/UWTuHneT2xagP3g/4jT960Op1vZfl/5o+mS8j+puT5FwQ+ zfW1S1diKc5INNRiLipOBAD0phjzawIAAA== X-CMS-MailID: 20200108115027eucas1p2abcd40e359e993e5b471229b02b69fc3 X-Msg-Generator: CA X-RootMTR: 20200108115027eucas1p2abcd40e359e993e5b471229b02b69fc3 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200108115027eucas1p2abcd40e359e993e5b471229b02b69fc3 References: Cc: Jimmy Cheng-Yi Chiang , Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski , Tzung-Bi Shih , Mark Brown , Sylwester Nawrocki , Dylan Reid , Marek Szyprowski Subject: [alsa-devel] [PATCH 1/2] ASoC: max98090: fix incorrect helper in max98090_dapm_put_enum_double() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" Commit 62d5ae4cafb7 ("ASoC: max98090: save and restore SHDN when changing sensitive registers") extended the code for handling "LTENL Mux", "LTENR Mux", "LBENL Mux" and "LBENR Mux" controls by adding a custom max98090_dapm_put_enum_double() function to them. However that function used incorrect helper to get its component object. Fix this by using the proper snd_soc_dapm_* helper. This fixes the following NULL pointer exception observed on Exynos4412-based Odroid U3 board: 8<--- cut here --- Unable to handle kernel NULL pointer dereference at virtual address 000000b0 pgd = (ptrval) [000000b0] *pgd=00000000 Internal error: Oops: 5 [#1] PREEMPT SMP ARM Modules linked in: CPU: 0 PID: 1104 Comm: alsactl Not tainted 5.5.0-rc5-next-20200107 #166 Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) PC is at __mutex_lock+0x54/0xb18 LR is at ___might_sleep+0x3c/0x2e0 ... Process alsactl (pid: 1104, stack limit = 0x(ptrval)) ... [] (__mutex_lock) from [] (mutex_lock_nested+0x1c/0x24) [] (mutex_lock_nested) from [] (max98090_shdn_save+0x1c/0x28) [] (max98090_shdn_save) from [] (max98090_dapm_put_enum_double+0x20/0x40) [] (max98090_dapm_put_enum_double) from [] (snd_ctl_ioctl+0x190/0xbb8) [] (snd_ctl_ioctl) from [] (ksys_ioctl+0x470/0xaf8) [] (ksys_ioctl) from [] (ret_fast_syscall+0x0/0x28) ... ---[ end trace 0e93f0580f4b9241 ]--- Fixes: 62d5ae4cafb7 ("ASoC: max98090: save and restore SHDN when changing sensitive registers") Signed-off-by: Marek Szyprowski --- sound/soc/codecs/max98090.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 4c7b16d557e2..c01ce4a3f86d 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -82,7 +82,7 @@ static int max98090_dapm_put_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_component *component = - snd_soc_kcontrol_component(kcontrol); + snd_soc_dapm_kcontrol_component(kcontrol); struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component); int ret;