From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon, 9 Feb 2015 08:05:22 +0000 (+0000)
Subject: ASoC: rsnd: set device data before snd_soc_register_platform/component
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0b1f6ec7a5fb3faff1a62afee132dac316eec63d;p=linux-beck.git

ASoC: rsnd: set device data before snd_soc_register_platform/component

Set device data before snd_soc_register_platform/component.
Otherwise, it will use NULL pointer if user calls unbind -> bind or
rmmod -> insmod

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 75308bbc2ce8..fc227d3bc021 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1268,6 +1268,8 @@ static int rsnd_probe(struct platform_device *pdev)
 			goto exit_snd_probe;
 	}
 
+	dev_set_drvdata(dev, priv);
+
 	/*
 	 *	asoc register
 	 */
@@ -1284,8 +1286,6 @@ static int rsnd_probe(struct platform_device *pdev)
 		goto exit_snd_soc;
 	}
 
-	dev_set_drvdata(dev, priv);
-
 	pm_runtime_enable(dev);
 
 	dev_info(dev, "probed\n");