diff options
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f594ab888e17..c96a6184d66e 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -768,7 +768,7 @@ static int soc_probe(struct platform_device *pdev) | |||
768 | for (i = 0; i < machine->num_links; i++) { | 768 | for (i = 0; i < machine->num_links; i++) { |
769 | struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai; | 769 | struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai; |
770 | if (cpu_dai->probe) { | 770 | if (cpu_dai->probe) { |
771 | ret = cpu_dai->probe(pdev); | 771 | ret = cpu_dai->probe(pdev, cpu_dai); |
772 | if (ret < 0) | 772 | if (ret < 0) |
773 | goto cpu_dai_err; | 773 | goto cpu_dai_err; |
774 | } | 774 | } |
@@ -798,7 +798,7 @@ cpu_dai_err: | |||
798 | for (i--; i >= 0; i--) { | 798 | for (i--; i >= 0; i--) { |
799 | struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai; | 799 | struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai; |
800 | if (cpu_dai->remove) | 800 | if (cpu_dai->remove) |
801 | cpu_dai->remove(pdev); | 801 | cpu_dai->remove(pdev, cpu_dai); |
802 | } | 802 | } |
803 | 803 | ||
804 | if (machine->remove) | 804 | if (machine->remove) |
@@ -827,7 +827,7 @@ static int soc_remove(struct platform_device *pdev) | |||
827 | for (i = 0; i < machine->num_links; i++) { | 827 | for (i = 0; i < machine->num_links; i++) { |
828 | struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai; | 828 | struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai; |
829 | if (cpu_dai->remove) | 829 | if (cpu_dai->remove) |
830 | cpu_dai->remove(pdev); | 830 | cpu_dai->remove(pdev, cpu_dai); |
831 | } | 831 | } |
832 | 832 | ||
833 | if (machine->remove) | 833 | if (machine->remove) |