Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-08 14:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: tegra30: i2s: Fix incorrect usage of of_device_get_match_data

Browse Source 
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: 356b94a32a ("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>
This commit is contained in:
Aakash Hemadri 2021-08-17 02:44:52 +05:30 committed by Mark Brown
parent ea2efedefb
commit 240fdf3f42
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/tegra/tegra30_i2s.c
View File

@ -406,7 +406,7 @@ static const struct of_device_id tegra30_i2s_of_match[] = {
static int tegra30_i2s_platform_probe(struct platform_device *pdev) static int tegra30_i2s_platform_probe(struct platform_device *pdev)
{ {
struct tegra30_i2s *i2s; struct tegra30_i2s *i2s;
const struct of_device_id *match; const struct tegra30_i2s_soc_data *soc_data;
u32 cif_ids[2]; u32 cif_ids[2];
void __iomem *regs; void __iomem *regs;
int ret; int ret;
@ -418,13 +418,13 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev)
} }
dev_set_drvdata(&pdev->dev, i2s); dev_set_drvdata(&pdev->dev, i2s);
match = of_device_get_match_data(&pdev->dev); soc_data = of_device_get_match_data(&pdev->dev);
if (!match) { if (!soc_data) {
dev_err(&pdev->dev, "Error: No device match found\n"); dev_err(&pdev->dev, "Error: No device match found\n");
ret = -ENODEV; ret = -ENODEV;
goto err; 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 = tegra30_i2s_dai_template;
i2s->dai.name = dev_name(&pdev->dev); i2s->dai.name = dev_name(&pdev->dev);