blob: 1651fc291b47034449c8128e6a430b65d3fb857a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
--- setup/Linux/oss/build/pci_wrapper.inc 2014-08-31 19:40:14.000000000 +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)
static int __devexit
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
static int
+#else
+ void
#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
|