diff options
| author | Aakash Hemadri <aakashhemadri123@gmail.com> | 2021-08-16 23:14:52 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-08-17 14:35:00 +0200 |
| commit | 240fdf3f42fc6505adecaf5a74fac75b3c702cf1 (patch) | |
| tree | 1ff7d15e8d4596ba8471ef503a155fd3058fec87 | |
| parent | ASoC: tegra30: ahub: Fix incorrect usage of of_device_get_match_data (diff) | |
| download | linux-240fdf3f42fc6505adecaf5a74fac75b3c702cf1.tar.xz linux-240fdf3f42fc6505adecaf5a74fac75b3c702cf1.zip | |
ASoC: tegra30: i2s: Fix incorrect usage of of_device_get_match_data
const struct of_device_id incorrectly assigned "match->data" using
of_device_get_match_data()
Instead assign `const struct tegra30_i2s_soc_data *soc_data` with
const void *of_device_get_match_data(...)
Fixes: 356b94a32a75 ("ASoC: tegra30: i2s: Use of_device_get_match_data")
Signed-off-by: Aakash Hemadri <aakashhemadri123@gmail.com>
Link: https://lore.kernel.org/r/4805c7fcd35c8deada63d41cb34d40de80f85a13.1629148177.git.aakashhemadri123@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/tegra/tegra30_i2s.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index d4c5594efaf1..084a533bf4f2 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -406,7 +406,7 @@ static const struct of_device_id tegra30_i2s_of_match[] = { static int tegra30_i2s_platform_probe(struct platform_device *pdev) { struct tegra30_i2s *i2s; - const struct of_device_id *match; + const struct tegra30_i2s_soc_data *soc_data; u32 cif_ids[2]; void __iomem *regs; int ret; @@ -418,13 +418,13 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) } dev_set_drvdata(&pdev->dev, i2s); - match = of_device_get_match_data(&pdev->dev); - if (!match) { + soc_data = of_device_get_match_data(&pdev->dev); + if (!soc_data) { dev_err(&pdev->dev, "Error: No device match found\n"); ret = -ENODEV; goto err; } - i2s->soc_data = (struct tegra30_i2s_soc_data *)match->data; + i2s->soc_data = soc_data; i2s->dai = tegra30_i2s_dai_template; i2s->dai.name = dev_name(&pdev->dev); |