Clean up patch allowing compilation with kernel 4.6

3 files changed, 25 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ddc1d358c4cd..c2e8540e213c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = oss-git
 	pkgver = ac48ed
-	pkgrel = 4
+	pkgrel = 5
 	url = http://developer.opensound.com/
 	arch = i686
 	arch = x86_64
@@ -20,7 +20,7 @@ pkgbase = oss-git
 	sha512sums = SKIP
 	sha512sums = 504efe3af933af69e14408215a8a71d6b94d181e076f90be538f859f1d2c2ae6d2e8e49499c1e50ee3f074004e3f79c1da2b734c95cc666b98d566d404cfc7a5
 	sha512sums = 762a8e84d3106ae26ee50e4022c62bee551d2a46923945b291975d3c1ff7a87876ad4a94408fe1718a5dd4613d279a0f7a8820f8fcb0479ca1f210bc711ea835
-	sha512sums = a9b97ff0884868a51d3a317d06b6e3df4ccd201d1284f8cd545252cebc6f20e9735a2768cb74bf74dc09cacbb4b3909341797e30d03804ab05a6b3b6e40484ec
+	sha512sums = 0186ee1d81cf6c64c4e51418434116cadcdf2a40bc4662de01ddfa1e014fe12ed7b135fc4f49e1d12113d826695047a1b64cef3c06befc56d03ec41453c77253
 	sha512sums = 355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e
 	sha512sums = 6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be
 	sha512sums = 64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690
diff --git a/PKGBUILD b/PKGBUILD
index cbfd8f28ebc6..d8373bdb10b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgbase=oss-git
 pkgname=oss-git
 true && pkgname=(oss-git libflashsupport-oss-git)
 pkgver=ac48ed
-pkgrel=4
+pkgrel=5
 arch=(i686 x86_64)
 url="http://developer.opensound.com/"
 license=(GPL2)
@@ -29,7 +29,7 @@ source=(oss::git://git.code.sourceforge.net/p/opensound/git
 sha512sums=('SKIP'
 	    '504efe3af933af69e14408215a8a71d6b94d181e076f90be538f859f1d2c2ae6d2e8e49499c1e50ee3f074004e3f79c1da2b734c95cc666b98d566d404cfc7a5'
 	    '762a8e84d3106ae26ee50e4022c62bee551d2a46923945b291975d3c1ff7a87876ad4a94408fe1718a5dd4613d279a0f7a8820f8fcb0479ca1f210bc711ea835'
-	    'a9b97ff0884868a51d3a317d06b6e3df4ccd201d1284f8cd545252cebc6f20e9735a2768cb74bf74dc09cacbb4b3909341797e30d03804ab05a6b3b6e40484ec'
+	    '0186ee1d81cf6c64c4e51418434116cadcdf2a40bc4662de01ddfa1e014fe12ed7b135fc4f49e1d12113d826695047a1b64cef3c06befc56d03ec41453c77253'
             '355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e'
             '6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be'
             '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690'
diff --git a/linux-4.6.patch b/linux-4.6.patch
index 703b9e2edf29..1651fc291b47 100644
--- a/linux-4.6.patch
+++ b/linux-4.6.patch
@@ -1,5 +1,5 @@
 --- setup/Linux/oss/build/pci_wrapper.inc	2014-08-31 19:40:14.000000000 +0100
-+++ setup/Linux/oss/build/pci_wrapper.inc	2016-06-14 23:50:17.138446865 +0100
++++ setup/Linux/oss/build/pci_wrapper.inc	2016-06-15 06:51:46.402770996 +0100
 @@ -71,8 +71,10 @@
  
  #if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
@@ -12,3 +12,23 @@
  #endif
  osspci_remove (struct pci_dev *pcidev)
  {
+@@ -88,11 +90,19 @@
+ 	pci_disable_device (dev_map[i].pcidev);
+ 	osdev_delete (osdev);
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
+ 	return 0;
++#else
++	return;
++#endif
+       }
+ 
+   printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n");
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
+   return -EIO;
++#else
++  return;
++#endif
+ }
+ 
+ void