patch-2.4.0-test9 linux/drivers/sound/trident.c

• Lines: 27
• Date: Mon Sep 18 14:57:01 2000
• Orig file: v2.4.0-test8/linux/drivers/sound/trident.c
• Orig date: Tue Aug 29 14:09:15 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/sound/trident.c linux/drivers/sound/trident.c
@@ -2484,7 +2484,7 @@
 		/* edited by HMSEO for GT sound*/
 	}
 
-	pci_dev->driver_data = card;
+	pci_set_drvdata(pci_dev, card);
 	pci_dev->dma_mask = TRIDENT_DMA_MASK;
 
 	/* Enable Address Engine Interrupts */
@@ -2496,7 +2496,7 @@
 static void __exit trident_remove(struct pci_dev *pci_dev)
 {
 	int i;
-	struct trident_card *card = pci_dev->driver_data;
+	struct trident_card *card = pci_get_drvdata(pci_dev);
 
 	/* Kill interrupts, and SP/DIF */
 	trident_disable_loop_interrupts(card);
@@ -2514,6 +2514,8 @@
 	unregister_sound_dsp(card->dev_audio);
 
 	kfree(card);
+
+	pci_set_drvdata(pci_dev, NULL);
 }
 
 MODULE_AUTHOR("Alan Cox, Aaron Holtzman, Ollie Lho, Ching Ling Lee");