diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-03 18:08:59 (GMT) |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-03 18:08:59 (GMT) |
commit | 1c4b578aa4ea2ef98871dc8ad95acb1fa14f9bcd (patch) | |
tree | a5be6de20a51086ac240059f18fb5889bc210845 /sound/soc/soc-devres.c | |
parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
parent | ebff65473f56e6c30de928fd6a4f1ce5ae36e8c5 (diff) | |
download | linux-fsl-qoriq-1c4b578aa4ea2ef98871dc8ad95acb1fa14f9bcd.tar.xz |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Diffstat (limited to 'sound/soc/soc-devres.c')
-rw-r--r-- | sound/soc/soc-devres.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-devres.c b/sound/soc/soc-devres.c index b1d7322..3449c1e 100644 --- a/sound/soc/soc-devres.c +++ b/sound/soc/soc-devres.c @@ -66,7 +66,7 @@ static void devm_card_release(struct device *dev, void *res) */ int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card) { - struct device **ptr; + struct snd_soc_card **ptr; int ret; ptr = devres_alloc(devm_card_release, sizeof(*ptr), GFP_KERNEL); @@ -75,7 +75,7 @@ int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card) ret = snd_soc_register_card(card); if (ret == 0) { - *ptr = dev; + *ptr = card; devres_add(dev, ptr); } else { devres_free(ptr); |