zr36120: switch to pci_get_device refcounting API
PATCH 1/1 zr36120: switch to pci_get_device refcounting API
Signed-off-by Alan Cox <[email protected]>
drivers/media/video/zr36120.c +10 -6
@@ -1836,16 +1840,16 @@struct zoran *ztv;struct pci_dev *dev =NULL ;unsigned char revision; -int zoran_num=0 ; +int zoran_num =0 ; -while ((dev =pci_find_device (PCI_VENDOR_ID_ZORAN ,PCI_DEVICE_ID_ZORAN_36120 , dev))) +while ((dev =pci_get_device (PCI_VENDOR_ID_ZORAN ,PCI_DEVICE_ID_ZORAN_36120 , dev))) {/* Ok, a ZR36120/ZR36125 found! */ ztv = &zorans[zoran_num]; ztv->dev = dev;if (pci_enable_device (dev)) -return -EIO ; +continue ;pci_read_config_byte (dev,PCI_CLASS_REVISION , &revision); printk(KERN_INFO "zoran: Zoran %x (rev %d) ",
@@ -1863,17 +1867,18 @@ {iounmap (ztv->zoran_mem);printk (KERN_ERR "zoran: Bad irq number or handler\n" ); -return -EINVAL ; +continue ; }if (result==-EBUSY )printk (KERN_ERR "zoran: IRQ %d busy, change your PnP config in BIOS\n" ,dev->irq);if (result <0 ) {iounmap (ztv->zoran_mem); -return result; +continue ; }/* Enable bus-mastering */ pci_set_master (dev); - +/* Keep a reference */ +pci_dev_get (dev); zoran_num++; }if (zoran_num)
@@ -2037,6 +2043,9 @@if (ztv->zoran_mem)iounmap (ztv->zoran_mem); +/* Drop PCI device */ +pci_dev_put (ztv->dev); +video_unregister_device (&ztv->video_dev);video_unregister_device (&ztv->vbi_dev); }