| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107 |
- From 2508082b19a36af8ad56d401c910362b4d54ffca Mon Sep 17 00:00:00 2001
- From: Matthias Reichl <hias@horus.com>
- Date: Tue, 23 Feb 2016 17:28:23 +0100
- Subject: [PATCH] ASoC: bcm: add missing .owner fields in sound card drivers
- If snd_soc_card.owner is not set the kernel won't do usage refcounting
- and one can remove the card driver module while it's in use (eg playback
- active) - which leads to a kernel crash.
- The missing owner field also prevents ALSA slot ordering
- (options snd slots=module-name1,module-name-2,...) from working with
- the I2S cards as it has no module name to match against.
- Fix these issues by setting the .owner field in the snd_soc_card structs.
- Signed-off-by: Matthias Reichl <hias@horus.com>
- ---
- sound/soc/bcm/hifiberry_amp.c | 1 +
- sound/soc/bcm/hifiberry_dac.c | 1 +
- sound/soc/bcm/hifiberry_dacplus.c | 1 +
- sound/soc/bcm/hifiberry_digi.c | 1 +
- sound/soc/bcm/iqaudio-dac.c | 1 +
- sound/soc/bcm/raspidac3.c | 1 +
- sound/soc/bcm/rpi-dac.c | 1 +
- sound/soc/bcm/rpi-proto.c | 1 +
- 8 files changed, 8 insertions(+)
- --- a/sound/soc/bcm/hifiberry_amp.c
- +++ b/sound/soc/bcm/hifiberry_amp.c
- @@ -61,6 +61,7 @@ static struct snd_soc_dai_link snd_rpi_h
-
- static struct snd_soc_card snd_rpi_hifiberry_amp = {
- .name = "snd_rpi_hifiberry_amp",
- + .owner = THIS_MODULE,
- .dai_link = snd_rpi_hifiberry_amp_dai,
- .num_links = ARRAY_SIZE(snd_rpi_hifiberry_amp_dai),
- };
- --- a/sound/soc/bcm/hifiberry_dac.c
- +++ b/sound/soc/bcm/hifiberry_dac.c
- @@ -63,6 +63,7 @@ static struct snd_soc_dai_link snd_rpi_h
- /* audio machine driver */
- static struct snd_soc_card snd_rpi_hifiberry_dac = {
- .name = "snd_rpi_hifiberry_dac",
- + .owner = THIS_MODULE,
- .dai_link = snd_rpi_hifiberry_dac_dai,
- .num_links = ARRAY_SIZE(snd_rpi_hifiberry_dac_dai),
- };
- --- a/sound/soc/bcm/hifiberry_dacplus.c
- +++ b/sound/soc/bcm/hifiberry_dacplus.c
- @@ -287,6 +287,7 @@ static struct snd_soc_dai_link snd_rpi_h
- /* audio machine driver */
- static struct snd_soc_card snd_rpi_hifiberry_dacplus = {
- .name = "snd_rpi_hifiberry_dacplus",
- + .owner = THIS_MODULE,
- .dai_link = snd_rpi_hifiberry_dacplus_dai,
- .num_links = ARRAY_SIZE(snd_rpi_hifiberry_dacplus_dai),
- };
- --- a/sound/soc/bcm/hifiberry_digi.c
- +++ b/sound/soc/bcm/hifiberry_digi.c
- @@ -164,6 +164,7 @@ static struct snd_soc_dai_link snd_rpi_h
- /* audio machine driver */
- static struct snd_soc_card snd_rpi_hifiberry_digi = {
- .name = "snd_rpi_hifiberry_digi",
- + .owner = THIS_MODULE,
- .dai_link = snd_rpi_hifiberry_digi_dai,
- .num_links = ARRAY_SIZE(snd_rpi_hifiberry_digi_dai),
- };
- --- a/sound/soc/bcm/iqaudio-dac.c
- +++ b/sound/soc/bcm/iqaudio-dac.c
- @@ -77,6 +77,7 @@ static struct snd_soc_dai_link snd_rpi_i
- /* audio machine driver */
- static struct snd_soc_card snd_rpi_iqaudio_dac = {
- .name = "IQaudIODAC",
- + .owner = THIS_MODULE,
- .dai_link = snd_rpi_iqaudio_dac_dai,
- .num_links = ARRAY_SIZE(snd_rpi_iqaudio_dac_dai),
- };
- --- a/sound/soc/bcm/raspidac3.c
- +++ b/sound/soc/bcm/raspidac3.c
- @@ -128,6 +128,7 @@ static struct snd_soc_dai_link snd_rpi_r
- /* audio machine driver */
- static struct snd_soc_card snd_rpi_raspidac3 = {
- .name = "RaspiDAC Rev.3x HiFi Audio Card",
- + .owner = THIS_MODULE,
- .dai_link = snd_rpi_raspidac3_dai,
- .num_links = ARRAY_SIZE(snd_rpi_raspidac3_dai),
- };
- --- a/sound/soc/bcm/rpi-dac.c
- +++ b/sound/soc/bcm/rpi-dac.c
- @@ -60,6 +60,7 @@ static struct snd_soc_dai_link snd_rpi_r
- /* audio machine driver */
- static struct snd_soc_card snd_rpi_rpi_dac = {
- .name = "snd_rpi_rpi_dac",
- + .owner = THIS_MODULE,
- .dai_link = snd_rpi_rpi_dac_dai,
- .num_links = ARRAY_SIZE(snd_rpi_rpi_dac_dai),
- };
- --- a/sound/soc/bcm/rpi-proto.c
- +++ b/sound/soc/bcm/rpi-proto.c
- @@ -91,6 +91,7 @@ static struct snd_soc_dai_link snd_rpi_p
- /* audio machine driver */
- static struct snd_soc_card snd_rpi_proto = {
- .name = "snd_rpi_proto",
- + .owner = THIS_MODULE,
- .dai_link = snd_rpi_proto_dai,
- .num_links = ARRAY_SIZE(snd_rpi_proto_dai),
- };
|
