fix build with newer kernels, again

3 files changed, 18 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 371e8c84e8d3..47d75483ec5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sixfireusb-dkms
 	pkgdesc = Kernel modules for the Terratec DMX6FireUSB soundcard, including firmware
 	pkgver = 0.6.2
-	pkgrel = 8
+	pkgrel = 9
 	url = http://sourceforge.net/projects/sixfireusb
 	arch = i686
 	arch = x86_64
@@ -14,12 +14,14 @@ pkgbase = sixfireusb-dkms
 	source = http://sourceforge.net/projects/sixfireusb/files/tools/fwinst.sh
 	source = fwinst.patch
 	source = pcm.patch
+	source = control.patch
 	source = dkms.conf
 	source = blacklist-sixfireusb-dkms.conf
 	sha512sums = e79e4a62762626d966fa8c169b8666a0cfa3af8516e6f8a97e1a1d211d1deb1ed26bd2c5c8a4b563e03718c232e832686be783abbb66e5b49c8cc31858752068
 	sha512sums = 7e8eb7a78514f79b6ee2bb25357a233b1013884b836de5ea3784b7e5a5bdac423b7803ce92c9a31869b280f4b8edde595fdaca51aebf253eb6f6ffdee8ed1290
 	sha512sums = fafabb05dafd1c03e715bcbdbb73c2fb4cc0e39695117e6b0260419bd2fa1dbeaf0982092a491724737ea31f09ef99e6e8cabce7e1dd98aca189a216530700b8
 	sha512sums = 5284cb5da0354eaba6a86e43634eac17097f20dc0120f4e3c06f9c9dc82a4659e2d487cde5bbab4c18a391a6db881255b48051afcf13fdad5c6a32a5e3aba576
+	sha512sums = a6656a0a86db963e324c8bb3f3f1a9160c6962d8c01e42e02006886123e45f4a86bda7770b6561f107a781bb6436b1a3d37f7f2d005347dc22b1e510d10e4c47
 	sha512sums = e15302d1b589296ddc234f1836438bdfc0b864d1a6f2cf808d99dc5ed8f82b3fcdf7a097128af1f4f2e90258c9c0f9098b6d73698147ca830e08acdec64d85fb
 	sha512sums = 154150d5f6959c174a883504464e15e0c728ed71fa7f18ee3e75fa6e6810b7cdb87fae4a9df50587f7324943b5027096f9ef6b98e33bdcf147039fca1049dbd5
 
diff --git a/PKGBUILD b/PKGBUILD
index a2dd2c57a98d..8d270fe2299a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=sixfireusb-dkms
 pkgver=0.6.2
-pkgrel=8
+pkgrel=9
 pkgdesc="Kernel modules for the Terratec DMX6FireUSB soundcard, including firmware"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/sixfireusb"
@@ -18,6 +18,7 @@ source=(http://sourceforge.net/projects/sixfireusb/files/sixfireusb-$pkgver.tar.
         http://sourceforge.net/projects/sixfireusb/files/tools/fwinst.sh
         fwinst.patch
         pcm.patch
+        control.patch
         dkms.conf
         blacklist-sixfireusb-dkms.conf
 )
@@ -25,6 +26,7 @@ sha512sums=('e79e4a62762626d966fa8c169b8666a0cfa3af8516e6f8a97e1a1d211d1deb1ed26
             '7e8eb7a78514f79b6ee2bb25357a233b1013884b836de5ea3784b7e5a5bdac423b7803ce92c9a31869b280f4b8edde595fdaca51aebf253eb6f6ffdee8ed1290'
             'fafabb05dafd1c03e715bcbdbb73c2fb4cc0e39695117e6b0260419bd2fa1dbeaf0982092a491724737ea31f09ef99e6e8cabce7e1dd98aca189a216530700b8'
             '5284cb5da0354eaba6a86e43634eac17097f20dc0120f4e3c06f9c9dc82a4659e2d487cde5bbab4c18a391a6db881255b48051afcf13fdad5c6a32a5e3aba576'
+            'a6656a0a86db963e324c8bb3f3f1a9160c6962d8c01e42e02006886123e45f4a86bda7770b6561f107a781bb6436b1a3d37f7f2d005347dc22b1e510d10e4c47'
             'e15302d1b589296ddc234f1836438bdfc0b864d1a6f2cf808d99dc5ed8f82b3fcdf7a097128af1f4f2e90258c9c0f9098b6d73698147ca830e08acdec64d85fb'
             '154150d5f6959c174a883504464e15e0c728ed71fa7f18ee3e75fa6e6810b7cdb87fae4a9df50587f7324943b5027096f9ef6b98e33bdcf147039fca1049dbd5')
 
@@ -32,6 +34,7 @@ build() {
     cd "${srcdir}"
     patch --forward --input=fwinst.patch --output=fwinst-patched.sh --follow-symlink
     patch --strip=0 --forward --input=pcm.patch
+    patch --strip=0 --forward --input=control.patch
 }
 
 package() {
diff --git a/control.patch b/control.patch
new file mode 100644
index 000000000000..a41761004f51
--- /dev/null
+++ b/control.patch
@@ -0,0 +1,11 @@
+--- sixfireusb-0.6.2/control.c	2013-02-04 03:18:31.000000000 +0100
++++ sixfireusb-0.6.2/control.c	2020-11-04 19:12:21.308854791 +0100
+@@ -571,7 +571,7 @@
+ 		ret = snd_ctl_add(card, control);
+ 		if (ret < 0)
+ 			return ret;
+-		ret = snd_ctl_add_slave(vmaster, control);
++		ret = snd_ctl_add_follower(vmaster, control);
+ 		if (ret < 0)
+ 			return ret;
+ 		i++;