diff options
| author | Mark Brown <broonie@kernel.org> | 2024-06-21 15:17:21 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-06-21 15:17:21 +0300 |
| commit | de7a09dec4b90a7f92b1ebcdfeed69400b5079f4 (patch) | |
| tree | 733d2f51b62d8d8213739d54d87fb1b4f2415b94 /sound/soc/ti/omap-hdmi.c | |
| parent | ae8fc2948b48f001514d4b73167fcef3b398a5fb (diff) | |
| parent | 90f3feb24172185f1832636264943e8b5e289245 (diff) | |
| download | linux-de7a09dec4b90a7f92b1ebcdfeed69400b5079f4.tar.xz | |
ASoC: Merge up fixes
We need some of the AMD fixes as a base for new work.
Diffstat (limited to 'sound/soc/ti/omap-hdmi.c')
| -rw-r--r-- | sound/soc/ti/omap-hdmi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/ti/omap-hdmi.c b/sound/soc/ti/omap-hdmi.c index 639bc83f4263..cf43ac19c4a6 100644 --- a/sound/soc/ti/omap-hdmi.c +++ b/sound/soc/ti/omap-hdmi.c @@ -354,11 +354,7 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev) if (!card) return -ENOMEM; - card->name = devm_kasprintf(dev, GFP_KERNEL, - "HDMI %s", dev_name(ad->dssdev)); - if (!card->name) - return -ENOMEM; - + card->name = "HDMI"; card->owner = THIS_MODULE; card->dai_link = devm_kzalloc(dev, sizeof(*(card->dai_link)), GFP_KERNEL); |