diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-30 13:45:00 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-30 13:45:00 +0000 |
| commit | 68e67d97e1f91ed11e041b67f3a1336f518c608f (patch) | |
| tree | 1de288bc05f1cf1bfec20200a60ffe99dcce77ae /sound/soc/soc-devres.c | |
| parent | 9e03d05eee4ca45ed12749ef6c26bf616262cdd2 (diff) | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff) | |
Merge tag 'v3.13-rc6' into spi-rcar
To resolve spurious merge conflicts with fixes.
Linux 3.13-rc6
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 b1d732255c0..3449c1e909a 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); |