patch-2.3.31 linux/drivers/sound/sonicvibes.c

• Lines: 26
• Date: Tue Dec 7 10:12:01 1999
• Orig file: v2.3.30/linux/drivers/sound/sonicvibes.c
• Orig date: Tue Dec 7 09:32:46 1999

diff -u --recursive --new-file v2.3.30/linux/drivers/sound/sonicvibes.c linux/drivers/sound/sonicvibes.c
@@ -83,6 +83,7 @@
  *                     OSS more closely; remove possible wakeup race
  *    28.10.99   0.22  More waitqueue races fixed
  *    01.12.99   0.23  New argument to allocate_resource
+ *    07.12.99   0.24  More allocate_resource semantics change
  *
  */
 
@@ -2434,7 +2435,7 @@
 
 	if (!pci_present())   /* No PCI bus in this machine! */
 		return -ENODEV;
-	printk(KERN_INFO "sv: version v0.23 time " __TIME__ " " __DATE__ "\n");
+	printk(KERN_INFO "sv: version v0.24 time " __TIME__ " " __DATE__ "\n");
 #if 0
 	if (!(wavetable_mem = __get_free_pages(GFP_KERNEL, 20-PAGE_SHIFT)))
 		printk(KERN_INFO "sv: cannot allocate 1MB of contiguous nonpageable memory for wavetable data\n");
@@ -2458,7 +2459,7 @@
 			memcpy(ddmaname, sv_ddma_name, ddmanamelen);
 			pcidev->resource[RESOURCE_DDMA].name = ddmaname;
 			if (allocate_resource(&ioport_resource, pcidev->resource+RESOURCE_DDMA, 
-					      2*SV_EXTENT_DMA, 0x1000, 0x10000-2*SV_EXTENT_DMA, 1024, pcidev)) {
+					      2*SV_EXTENT_DMA, 0x1000, 0x10000-2*SV_EXTENT_DMA, 1024, NULL, NULL)) {
 				pcidev->resource[RESOURCE_DDMA].name = NULL;
 				kfree(ddmaname);
 				printk(KERN_ERR "sv: cannot allocate DDMA controller io ports\n");