moved das1800_probe() back in das1800_attach() to insure no io to ports

happens until after io addresses have been requested

diff --git a/comedi/drivers/das1800.c b/comedi/drivers/das1800.c
index cd41eb8433ed71f8b80fa91d18d215ede3e23bf6..e95078db35187119b411f991821db8ee1c09b514 100644 (file)
--- a/comedi/drivers/das1800.c
+++ b/comedi/drivers/das1800.c
@@ -506,16 +506,6 @@ static int das1800_attach(comedi_device *dev, comedi_devconfig *it)
                return -EINVAL;
        }
 
-       dev->board = das1800_probe(dev);
-       if(dev->board < 0)
-       {
-               printk("unable to determine board type\n");
-               return -ENODEV;
-       }
-
-       dev->board_ptr = das1800_boards + dev->board;
-       dev->board_name = thisboard->name;
-
        /* check if io addresses are available */
        if(check_region(iobase, DAS1800_SIZE) < 0)
        {
@@ -540,6 +530,16 @@ static int das1800_attach(comedi_device *dev, comedi_devconfig *it)
                devpriv->iobase2 = iobase2;
        }
 
+       dev->board = das1800_probe(dev);
+       if(dev->board < 0)
+       {
+               printk("unable to determine board type\n");
+               return -ENODEV;
+       }
+
+       dev->board_ptr = das1800_boards + dev->board;
+       dev->board_name = thisboard->name;
+
        /* grab our IRQ */
        if(irq)
        {