Added support for Unicontrols PCI CAN card.

[lincan.git] / lincan / src / kv_pcican.c

diff --git a/lincan/src/kv_pcican.c b/lincan/src/kv_pcican.c
index c49a3def3d7e5a617ddec58a9ab6bdcc93fa1ee3..e7f36e3306cef9b1e6ccabb0cb0f46614d542622 100644 (file)
--- a/lincan/src/kv_pcican.c
+++ b/lincan/src/kv_pcican.c
@@ -183,8 +183,10 @@ int kv_pcican_init_hw_data(struct candevice_t *candev)
        struct pci_dev *pcidev = NULL;
        int i;
 
-       pcidev = pci_find_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID, pcidev);
-       if(pcidev == NULL) return -ENODEV;
+       do {
+               pcidev = pci_find_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID, pcidev);
+               if(pcidev == NULL) return -ENODEV;
+       } while(can_check_dev_taken(pcidev));
        
        if (pci_enable_device (pcidev)){
                printk(KERN_CRIT "Setup of PCICAN failed\n");
@@ -193,7 +195,7 @@ int kv_pcican_init_hw_data(struct candevice_t *candev)
        candev->sysdevptr.pcidev=pcidev;
        
        for(i=0;i<3;i++){
-               if(!(pci_resource_flags(pcidev,0)&IORESOURCE_IO)){
+               if(!(pci_resource_flags(pcidev,i)&IORESOURCE_IO)){
                        printk(KERN_CRIT "PCICAN region %d is not IO\n",i);
                        return -EIO;
                }