diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-10-21 14:05:26 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-10-21 14:05:26 +0200 |
commit | c8d2dcb3e94106395811ac86681a4439c560cbca (patch) | |
tree | 8bcb8096565bef5a8470e7acb1979673bc8c8c68 /sound/soc/rockchip | |
parent | 83629532ce45ef9df1f297b419b9ea112045685d (diff) | |
parent | 95a32c98055f664f9b3f34c41e153d4dcedd0eff (diff) |
Merge tag 'asoc-fix-v5.4-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.4
A collection of fixes that have arrived since the merge window. There
are a small number of core fixes here but they are smaller ones around
error handling.
Diffstat (limited to 'sound/soc/rockchip')
-rw-r--r-- | sound/soc/rockchip/rockchip_i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index af2d5a6124c8..61c984f10d8e 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -677,7 +677,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) ret = rockchip_pcm_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Could not register PCM\n"); - return ret; + goto err_suspend; } return 0; |