patch-2.4.5 linux/drivers/sound/emu10k1/main.c

• Lines: 33
• Date: Sat May 19 17:43:07 2001
• Orig file: v2.4.4/linux/drivers/sound/emu10k1/main.c
• Orig date: Tue Mar 20 12:04:59 2001

diff -u --recursive --new-file v2.4.4/linux/drivers/sound/emu10k1/main.c linux/drivers/sound/emu10k1/main.c
@@ -475,7 +475,8 @@
 	}
 
 	for (pagecount = 0; pagecount < MAXPAGES; pagecount++)
-		((u32 *) card->virtualpagetable.addr)[pagecount] = (card->silentpage.dma_handle * 2) | pagecount;
+		((u32 *) card->virtualpagetable.addr)[pagecount] =
+         cpu_to_le32((card->silentpage.dma_handle * 2) | pagecount);
 
 	/* Init page table & tank memory base register */
 	sblive_writeptr_tag(card, 0,
@@ -612,6 +613,10 @@
 {
 	struct emu10k1_card *card;
 	u32 subsysvid;
+	int ret;
+
+	if ((ret=pci_enable_device(pci_dev)))
+		return ret;
 
 	if ((card = kmalloc(sizeof(struct emu10k1_card), GFP_KERNEL)) == NULL) {
 		printk(KERN_ERR "emu10k1: out of memory\n");
@@ -621,11 +626,6 @@
 
 	if (pci_set_dma_mask(pci_dev, EMU10K1_DMA_MASK)) {
 		printk(KERN_ERR "emu10k1: architecture does not support 32bit PCI busmaster DMA\n");
-		kfree(card);
-		return -ENODEV;
-	}
-
-	if (pci_enable_device(pci_dev)) {
 		kfree(card);
 		return -ENODEV;
 	}