This little patch is needed to fix a compile error on 2.6.9-rc3-mm2:
[--- CUT HERE ---]
--- src/acx100.c 2004-10-05 08:52:32.000000000 +0200
+++ src/acx100.c~rc3-mm2-fix 2004-10-06 11:04:10.957146088 +0200
@@ -817,7 +817,7 @@
dev->base_addr = pci_resource_start(pdev, 0); /* TODO this is maybe incompatible to ACX111 */
/* need to be able to restore PCI state after a suspend */
- pci_save_state(pdev, priv->pci_state);
+ pci_save_state(pdev);
if (OK != acx_reset_dev(dev)) {
acxlog(L_BINSTD | L_INIT,
@@ -1134,7 +1134,7 @@
acxlog(L_STD, "acx100: experimental resume handler called for %p!\n", priv);
pci_set_power_state(pdev, 0);
acxlog(L_DEBUG, "rsm: power state set\n");
- pci_restore_state(pdev, priv->pci_state);
+ pci_restore_state(pdev);
acxlog(L_DEBUG, "rsm: PCI state restored\n");
acx_reset_dev(dev);
acxlog(L_DEBUG, "rsm: device reset done\n");
[--- END ---]
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
This little patch is needed to fix a compile error on 2.6.9-rc3-mm2:
[--- CUT HERE ---]
--- src/acx100.c 2004-10-05 08:52:32.000000000 +0200
+++ src/acx100.c~rc3-mm2-fix 2004-10-06 11:04:10.957146088 +0200
@@ -817,7 +817,7 @@
dev->base_addr = pci_resource_start(pdev, 0); /* TODO this is maybe incompatible to ACX111 */
/* need to be able to restore PCI state after a suspend */
- pci_save_state(pdev, priv->pci_state);
+ pci_save_state(pdev);
if (OK != acx_reset_dev(dev)) {
acxlog(L_BINSTD | L_INIT,
@@ -1134,7 +1134,7 @@
acxlog(L_STD, "acx100: experimental resume handler called for %p!\n", priv);
pci_set_power_state(pdev, 0);
acxlog(L_DEBUG, "rsm: power state set\n");
- pci_restore_state(pdev, priv->pci_state);
+ pci_restore_state(pdev);
acxlog(L_DEBUG, "rsm: PCI state restored\n");
acx_reset_dev(dev);
acxlog(L_DEBUG, "rsm: device reset done\n");
[--- END ---]
ARGH, why are they doing that now, in a "stable" kernel?
(sounds like they really intend to do incompatible changes in 2.6.x now)
I will commit a
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9)
pci_save_state(pdev);
#else
pci_save_state(pdev, priv->pci_state);
#endif