diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-04 20:42:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 20:42:41 +0000 |
| commit | e0427428db79f7d6648f27985c775b3f6f5db28b (patch) | |
| tree | c407636a4777b28380e9f6d0da9306a6daa46644 /sound | |
| parent | a9ca2a3cf40b28fd5672cae44c377a4d5c07404f (diff) | |
| parent | 0b1f6ec7a5fb3faff1a62afee132dac316eec63d (diff) | |
| download | linux-e0427428db79f7d6648f27985c775b3f6f5db28b.tar.gz linux-e0427428db79f7d6648f27985c775b3f6f5db28b.tar.bz2 linux-e0427428db79f7d6648f27985c775b3f6f5db28b.zip | |
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) goto exit_snd_probe; } + dev_set_drvdata(dev, priv); + /* * asoc register */ @@ -1268,8 +1270,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"); |