fix so cards on bus 0 can be chosen through configuration options
authorFrank Mori Hess <fmhess@speakeasy.net>
Fri, 25 May 2001 21:43:34 +0000 (21:43 +0000)
committerFrank Mori Hess <fmhess@speakeasy.net>
Fri, 25 May 2001 21:43:34 +0000 (21:43 +0000)
comedi/drivers/cb_pcidas.c
comedi/drivers/rtd520.c

index 07d66c493e10e847349789a3c3eedcccfb366331..e028f5e2243fdbedd2d2f35743ab97c1e6258508 100644 (file)
@@ -283,7 +283,7 @@ static int cb_pcidas_attach(comedi_device *dev, comedi_devconfig *it)
 
        pci_for_each_dev(pcidev){
                if(pcidev->vendor==PCI_VENDOR_CB){
-                       if(it->options[0] && it->options[1]){
+                       if(it->options[0] || it->options[1]){
                                if(pcidev->bus->number==it->options[0] &&
                                   PCI_SLOT(pcidev->devfn)==it->options[1]){
                                        break;
index 87ddb13e4d9b0865269fff97c9dfe6a0345c6c99..c37e92ada118e73730fa66ac8b48d27117a5796d 100644 (file)
@@ -578,7 +578,7 @@ static int rtd_attach (
      */
     pci_for_each_dev (pcidev) {
        if (pcidev->vendor == RTD_VENDOR_ID) {
-           if (it->options[0] && it->options[1]) {
+           if (it->options[0] || it->options[1]) {
                if (pcidev->bus->number == it->options[0]
                    && PCI_SLOT(pcidev->devfn) == it->options[1]) {
                    printk("rtd520: found bus=%d slot=%d\n",