[Prism54-devel] 2.6.10 compile patches

[Joerg Dorchain]

Hi,

these patches were necessary to make the cvs-version as of today compile
on 2.6.10 native.

Unfortunately, the driver still does not work anymore with the current
cvs driver (see attached kernel log). Does anyone have an idea what I
could try (patches appreciated) to make it work again?

Bye,

Joerg



--- islpci_hotplug.c.orig	2005-01-04 14:46:14.000000000 +0100
+++ islpci_hotplug.c	2005-01-04 14:48:40.000000000 +0100
@@ -277,7 +277,7 @@
 	printk(KERN_NOTICE "%s: got suspend request (state %d)\n",
 	       ndev->name, state);
 
-	pci_save_state(pdev, priv->pci_state);
+	pci_save_state(pdev);
 
 	/* tell the device not to trigger interrupts for now... */
 	isl38xx_disable_interrupts(priv->device_base);
@@ -303,7 +303,7 @@
 
 	printk(KERN_NOTICE "%s: got resume request\n", ndev->name);
 
-	pci_restore_state(pdev, priv->pci_state);
+	pci_restore_state(pdev);
 
 	/* alright let's go into the PREBOOT state */
 	islpci_reset(priv, 1);
--- islpci_mgt.c.orig	2005-01-04 14:51:26.000000000 +0100
+++ islpci_mgt.c	2005-01-04 15:10:38.000000000 +0100
@@ -344,7 +344,7 @@
 		}
 
 		/* Ensure the results of device DMA are visible to the CPU. */
-		pci_dma_sync_single(priv->pdev, buf->pci_addr,
+		pci_dma_sync_single_for_cpu(priv->pdev, buf->pci_addr,
 				buf->skb->len, PCI_DMA_FROMDEVICE);
 
 		/* Perform endianess conversion for PIMFOR header in-place. */
-------------- next part --------------
A non-text attachment was scrubbed...
Name: prism-errlog.gz
Type: application/octet-stream
Size: 1289 bytes
Desc: not available
Url : http://prism54.org/pipermail/prism54-devel/attachments/20050104/e6b6373b/prism-errlog.obj