1 files changed, 108 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0158-ASoC-bcm-add-missing-.owner-fields-in-sound-card-dri.patch b/target/linux/brcm2708/patches-4.4/0158-ASoC-bcm-add-missing-.owner-fields-in-sound-card-dri.patch
new file mode 100644
index 0000000000..d43c8ef31a
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.4/0158-ASoC-bcm-add-missing-.owner-fields-in-sound-card-dri.patch
@@ -0,0 +1,108 @@
+From 29c79ce79c70db703a4621ecc7d24208ca991981 Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <hias@horus.com>
+Date: Tue, 23 Feb 2016 17:28:23 +0100
+Subject: [PATCH 158/232] 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),
+ };