Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c2902c8ae06762d941fab64198467f78cab6f8cd

Authored by Takashi Iwai
Committed by Jaroslav Kysela
1 parent 48ec15dca8
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] Fix breakage with CONFIG_SYSFS_DEPRECATED 

The fix for sysfs breakage with CONFIG_SYSFS_DEPRECATED was flown
away by the conflicted merge of the ALSA git tree.  The patch below
fixes it again.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

include/sound/core.h
Diff comments   View file @ c2902c8
... ... @@ -242,7 +242,7 @@
242 242 {
243 243 return snd_register_device_for_dev(type, card, dev, f_ops,
244 244 private_data, name,
245   - card ? card->dev : NULL);
  245 + snd_card_get_device_link(card));
246 246 }
247 247  
248 248 int snd_unregister_device(int type, struct snd_card *card, int dev);
... ... @@ -968,7 +968,7 @@
968 968 * if possible */
969 969 dev = pcm->dev;
970 970 if (!dev)
971   - dev = pcm->card ? pcm->card->dev : NULL;
  971 + dev = snd_card_get_device_link(pcm->card);
972 972 /* register pcm */
973 973 err = snd_register_device_for_dev(devtype, pcm->card,
974 974 pcm->device,