Applied "ASoC: rockchip: Fix build" to the asoc tree

Message ID E1dLaDd-0004sK-PS@debutante
State New
Headers show

Commit Message

Mark Brown June 15, 2017, 7:14 p.m.
The patch

   ASoC: rockchip: Fix build

has been applied to the asoc tree at


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.


From b2e0a42e32d4eb9d5ee99264616dbba8fc288944 Mon Sep 17 00:00:00 2001
From: Mark Brown <>

Date: Thu, 15 Jun 2017 20:13:33 +0100
Subject: [PATCH] ASoC: rockchip: Fix build

Reported-by: Christophe Jaillet <>
Signed-off-by: Mark Brown <>

 sound/soc/rockchip/rockchip_i2s.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Alsa-devel mailing list


diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index ce09dee2202e..80db9b8f6605 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -641,7 +641,7 @@  static int rockchip_i2s_probe(struct platform_device *pdev)
 			goto err_pm_disable;
-	soc_dai = devm_kmemdup(&pdev->dev, &rockchip_i2s_dai
+	soc_dai = devm_kmemdup(&pdev->dev, &rockchip_i2s_dai,
 			       sizeof(*soc_dai), GFP_KERNEL);
 	if (!soc_dai) {
 		err = -ENOMEM;