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

e0427428 · Mark Brown · a9ca2a3c · 0b1f6ec7 · e0427428
Commit e0427428 authored Mar 04, 2015 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sound/soc/sh/rcar/core.c sound/soc/sh/rcar/core.c +2 -2

No files found.
--- 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");