X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/2c5dbee366e95b46de0cb95cab23d2a94a13f184..d659fb1c5ce646e10820cfd349d8a4220d1ee67d:/lincan/src/kv_pcican.c

diff --git a/lincan/src/kv_pcican.c b/lincan/src/kv_pcican.c
index eace091..e7f36e3 100644
--- 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;
 		}
@@ -241,6 +243,7 @@ int kv_pcican_init_chip_data(struct candevice_t *candev, int chipnr)
 	candev->chip[chipnr]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF;
 	candev->chip[chipnr]->sja_ocr_reg = KV_PCICAN_OCR_DEFAULT_STD;
 	candev->chip[chipnr]->clock = 16000000;
+	candev->chip[chipnr]->flags |= CHIP_IRQ_PCI;
 
 	return 0;
 }