Merge remote-tracking branch 'asoc/fix/rsnd' into asoc-linus

This commit is contained in:
Mark Brown 2015-03-04 20:42:41 +00:00
commit e0427428db
1 changed files with 2 additions and 2 deletions

View File

@ -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");