lkml.org 
[lkml]   [2020]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: Applied "ASoC: max98090: fix incorrect helper in max98090_dapm_put_enum_double()" to the asoc tree
From
Date
Hi Mark

On 09.01.2020 22:29, Mark Brown wrote:
> The patch
>
> ASoC: max98090: fix incorrect helper in max98090_dapm_put_enum_double()
>
> has been applied to the asoc tree at
>
> https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.6
>
> 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.

Something went wrong :/.

This patch has been applied twice. First time for the
max98090_dapm_put_enum_double() function (as it has been designed),
second time for max98090_put_enum_double(), what is completely wrong
thing (it does exactly the opposite thing).

Mark, please revert/drop 4e93c1294f4b051d574d6bc59755d2863286990e commit.


>
> Thanks,
> Mark
>
> >From 4e93c1294f4b051d574d6bc59755d2863286990e Mon Sep 17 00:00:00 2001
> From: Marek Szyprowski <m.szyprowski@samsung.com>
> Date: Wed, 8 Jan 2020 12:50:06 +0100
> Subject: [PATCH] ASoC: max98090: fix incorrect helper in
> max98090_dapm_put_enum_double()
>
> 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))
> ...
> [<c0b49630>] (__mutex_lock) from [<c0b4a110>] (mutex_lock_nested+0x1c/0x24)
> [<c0b4a110>] (mutex_lock_nested) from [<c0839b3c>] (max98090_shdn_save+0x1c/0x28)
> [<c0839b3c>] (max98090_shdn_save) from [<c083a4f8>] (max98090_dapm_put_enum_double+0x20/0x40)
> [<c083a4f8>] (max98090_dapm_put_enum_double) from [<c080d0e8>] (snd_ctl_ioctl+0x190/0xbb8)
> [<c080d0e8>] (snd_ctl_ioctl) from [<c02cafec>] (ksys_ioctl+0x470/0xaf8)
> [<c02cafec>] (ksys_ioctl) from [<c0101000>] (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 <m.szyprowski@samsung.com>
> Reviewed-by: Tzung-Bi Shih <tzungbi@google.com>
> Link: https://lore.kernel.org/r/20200108115007.31095-1-m.szyprowski@samsung.com
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> sound/soc/codecs/max98090.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
> index c01ce4a3f86d..ede03663cbed 100644
> --- a/sound/soc/codecs/max98090.c
> +++ b/sound/soc/codecs/max98090.c
> @@ -98,7 +98,7 @@ static int max98090_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;

Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland

\
 
 \ /
  Last update: 2020-01-10 10:03    [W:0.104 / U:6.892 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site