Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next

fc10c6db · Mark Brown · 6caa9892 · 99d8d3ba · fc10c6db
Commit fc10c6db authored Nov 03, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/kirkwood/kirkwood-i2s.c sound/soc/kirkwood/kirkwood-i2s.c +1 -1

No files found.
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -568,7 +568,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
 		} else {
 			dev_info(&pdev->dev, "found external clock\n");
 			clk_prepare_enable(priv->extclk);
-			soc_dai = &kirkwood_i2s_dai_extclk;
+			soc_dai = kirkwood_i2s_dai_extclk;
 		}
 	}