patch-2.4.0-test9 linux/drivers/media/video/bttv-driver.c

• Lines: 32
• Date: Sun Sep 17 09:45:06 2000
• Orig file: v2.4.0-test8/linux/drivers/media/video/bttv-driver.c
• Orig date: Mon Aug 7 21:01:35 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/media/video/bttv-driver.c linux/drivers/media/video/bttv-driver.c
@@ -3027,11 +3027,11 @@
  *	Scan for a Bt848 card, request the irq and map the io memory 
  */
 
-static void __devinit bttv_remove(struct pci_dev *pci_dev)
+static void __devexit bttv_remove(struct pci_dev *pci_dev)
 {
         u8 command;
         int j;
-        struct bttv *btv = PCI_GET_DRIVER_DATA(pci_dev);
+        struct bttv *btv = pci_get_drvdata(pci_dev);
 
         /* unregister i2c_bus */
 	if (0 == btv->i2c_ok)
@@ -3093,6 +3093,8 @@
         btv->shutdown=1;
         wake_up(&btv->gpioq);
 
+	pci_set_drvdata(pci_dev, NULL);
+
         return;
 }
 
@@ -3198,7 +3200,7 @@
                 }
         }
 
-	PCI_SET_DRIVER_DATA(dev,btv);
+	pci_set_drvdata(dev,btv);
 
 	if(init_bt848(btv) < 0) {
 		bttv_remove(dev);