diff options
Diffstat (limited to 'sound/soc/tegra/tegra_wm8753.c')
-rw-r--r-- | sound/soc/tegra/tegra_wm8753.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c index c8ef88a67c59..f87fc53e9b8c 100644 --- a/sound/soc/tegra/tegra_wm8753.c +++ b/sound/soc/tegra/tegra_wm8753.c | |||
@@ -124,6 +124,7 @@ static struct snd_soc_card snd_soc_tegra_wm8753 = { | |||
124 | 124 | ||
125 | static int tegra_wm8753_driver_probe(struct platform_device *pdev) | 125 | static int tegra_wm8753_driver_probe(struct platform_device *pdev) |
126 | { | 126 | { |
127 | struct device_node *np = pdev->dev.of_node; | ||
127 | struct snd_soc_card *card = &snd_soc_tegra_wm8753; | 128 | struct snd_soc_card *card = &snd_soc_tegra_wm8753; |
128 | struct tegra_wm8753 *machine; | 129 | struct tegra_wm8753 *machine; |
129 | int ret; | 130 | int ret; |
@@ -132,8 +133,7 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev) | |||
132 | GFP_KERNEL); | 133 | GFP_KERNEL); |
133 | if (!machine) { | 134 | if (!machine) { |
134 | dev_err(&pdev->dev, "Can't allocate tegra_wm8753 struct\n"); | 135 | dev_err(&pdev->dev, "Can't allocate tegra_wm8753 struct\n"); |
135 | ret = -ENOMEM; | 136 | return -ENOMEM; |
136 | goto err; | ||
137 | } | 137 | } |
138 | 138 | ||
139 | card->dev = &pdev->dev; | 139 | card->dev = &pdev->dev; |
@@ -148,8 +148,8 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev) | |||
148 | if (ret) | 148 | if (ret) |
149 | goto err; | 149 | goto err; |
150 | 150 | ||
151 | tegra_wm8753_dai.codec_of_node = of_parse_phandle( | 151 | tegra_wm8753_dai.codec_of_node = of_parse_phandle(np, |
152 | pdev->dev.of_node, "nvidia,audio-codec", 0); | 152 | "nvidia,audio-codec", 0); |
153 | if (!tegra_wm8753_dai.codec_of_node) { | 153 | if (!tegra_wm8753_dai.codec_of_node) { |
154 | dev_err(&pdev->dev, | 154 | dev_err(&pdev->dev, |
155 | "Property 'nvidia,audio-codec' missing or invalid\n"); | 155 | "Property 'nvidia,audio-codec' missing or invalid\n"); |
@@ -157,8 +157,8 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev) | |||
157 | goto err; | 157 | goto err; |
158 | } | 158 | } |
159 | 159 | ||
160 | tegra_wm8753_dai.cpu_of_node = of_parse_phandle( | 160 | tegra_wm8753_dai.cpu_of_node = of_parse_phandle(np, |
161 | pdev->dev.of_node, "nvidia,i2s-controller", 0); | 161 | "nvidia,i2s-controller", 0); |
162 | if (!tegra_wm8753_dai.cpu_of_node) { | 162 | if (!tegra_wm8753_dai.cpu_of_node) { |
163 | dev_err(&pdev->dev, | 163 | dev_err(&pdev->dev, |
164 | "Property 'nvidia,i2s-controller' missing or invalid\n"); | 164 | "Property 'nvidia,i2s-controller' missing or invalid\n"); |
@@ -166,8 +166,7 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev) | |||
166 | goto err; | 166 | goto err; |
167 | } | 167 | } |
168 | 168 | ||
169 | tegra_wm8753_dai.platform_of_node = | 169 | tegra_wm8753_dai.platform_of_node = tegra_wm8753_dai.cpu_of_node; |
170 | tegra_wm8753_dai.cpu_of_node; | ||
171 | 170 | ||
172 | ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); | 171 | ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); |
173 | if (ret) | 172 | if (ret) |