patch-2.4.3 linux/drivers/sound/es1371.c

• Lines: 21
• Date: Tue Mar 20 12:04:58 2001
• Orig file: v2.4.2/linux/drivers/sound/es1371.c
• Orig date: Wed Feb 21 18:20:34 2001

diff -u --recursive --new-file v2.4.2/linux/drivers/sound/es1371.c linux/drivers/sound/es1371.c
@@ -2737,9 +2737,10 @@
 		return -1;
 	if (pcidev->irq == 0) 
 		return -1;
-	if (!pci_dma_supported(pcidev, 0xffffffff)) {
+	i = pci_set_dma_mask(pcidev, 0xffffffff);
+	if (i) {
 		printk(KERN_WARNING "es1371: architecture does not support 32bit PCI busmaster DMA\n");
-		return -1;
+		return i;
 	}
 	if (!(s = kmalloc(sizeof(struct es1371_state), GFP_KERNEL))) {
 		printk(KERN_WARNING PFX "out of memory\n");
@@ -2874,7 +2875,6 @@
 	outl(cssr, s->io+ES1371_REG_STATUS);
 	/* store it in the driver field */
 	pci_set_drvdata(pcidev, s);
-	pcidev->dma_mask = 0xffffffff;
 	/* put it into driver list */
 	list_add_tail(&s->devs, &devs);
 	/* increment devindex */