diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-04 15:42:41 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-04 15:42:41 -0500 |
commit | e0427428db79f7d6648f27985c775b3f6f5db28b (patch) | |
tree | c407636a4777b28380e9f6d0da9306a6daa46644 /sound | |
parent | a9ca2a3cf40b28fd5672cae44c377a4d5c07404f (diff) | |
parent | 0b1f6ec7a5fb3faff1a62afee132dac316eec63d (diff) |
Merge remote-tracking branch 'asoc/fix/rsnd' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/sh/rcar/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 1b53605f7154..110577c52317 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c | |||
@@ -1252,6 +1252,8 @@ static int rsnd_probe(struct platform_device *pdev) | |||
1252 | goto exit_snd_probe; | 1252 | goto exit_snd_probe; |
1253 | } | 1253 | } |
1254 | 1254 | ||
1255 | dev_set_drvdata(dev, priv); | ||
1256 | |||
1255 | /* | 1257 | /* |
1256 | * asoc register | 1258 | * asoc register |
1257 | */ | 1259 | */ |
@@ -1268,8 +1270,6 @@ static int rsnd_probe(struct platform_device *pdev) | |||
1268 | goto exit_snd_soc; | 1270 | goto exit_snd_soc; |
1269 | } | 1271 | } |
1270 | 1272 | ||
1271 | dev_set_drvdata(dev, priv); | ||
1272 | |||
1273 | pm_runtime_enable(dev); | 1273 | pm_runtime_enable(dev); |
1274 | 1274 | ||
1275 | dev_info(dev, "probed\n"); | 1275 | dev_info(dev, "probed\n"); |