Package: oss4
Version: 4.2-build2010-5
Followup-For: Bug #829255
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve allow this package to build
with v4.6 based kernels:
* d/p/osspci_remove-should-return-void.patch -- correct return from
struct pci_device remove callback. (LP: #1599237)
Thanks.
-apw
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety
APT policy: (500, 'yakkety')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch
--- oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch 1970-01-01 01:00:00.000000000 +0100
+++ oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch 2016-07-05 17:08:34.000000000 +0100
@@ -0,0 +1,36 @@
+Description: osspci_remove should return void
+ The stuct pci_device callback remove should be a void function. This
+ has been true since 2.6.12 but only recently has this become fatal.
+Author: Andy Whitcroft <a...@ubuntu.com>
+---
+
+Index: oss4-4.2-build2010/setup/Linux/oss/build/pci_wrapper.inc
+===================================================================
+--- oss4-4.2-build2010.orig/setup/Linux/oss/build/pci_wrapper.inc
++++ oss4-4.2-build2010/setup/Linux/oss/build/pci_wrapper.inc
+@@ -70,9 +70,9 @@ osspci_probe (struct pci_dev *pcidev, co
+ }
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+- static int __devexit
++ static void __devexit
+ #else
+- static int
++ static void
+ #endif
+ osspci_remove (struct pci_dev *pcidev)
+ {
+@@ -87,12 +87,10 @@ osspci_remove (struct pci_dev *pcidev)
+ printk (KERN_ALERT DRIVER_NICK ": Unloading busy device\n");
+ pci_disable_device (dev_map[i].pcidev);
+ osdev_delete (osdev);
+-
+- return 0;
++ return;
+ }
+
+ printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n");
+- return -EIO;
+ }
+
+ void
diff -Nru oss4-4.2-build2010/debian/patches/series oss4-4.2-build2010/debian/patches/series
--- oss4-4.2-build2010/debian/patches/series 2015-09-26 00:31:01.000000000 +0100
+++ oss4-4.2-build2010/debian/patches/series 2016-07-05 17:06:41.000000000 +0100
@@ -19,3 +19,4 @@
#generic_srccconf.patch (seems completely broken to me)
501_linux_version.patch
502_linux_io.patch
+osspci_remove-should-return-void.patch
