staging: comedi: cb_das16_cs: probe for the device first
During the attach of the comedi_driver, the device type probe can fail. We should do the probe before requesting the irq for the driver. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
8c50aa1532
commit
9a4d211547
|
@ -454,6 +454,13 @@ static int das16cs_attach(struct comedi_device *dev,
|
||||||
if (!link)
|
if (!link)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
|
dev->board_ptr = das16cs_probe(dev, link);
|
||||||
|
if (!dev->board_ptr)
|
||||||
|
return -EIO;
|
||||||
|
thisboard = comedi_board(dev);
|
||||||
|
|
||||||
|
dev->board_name = thisboard->name;
|
||||||
|
|
||||||
dev->iobase = link->resource[0]->start;
|
dev->iobase = link->resource[0]->start;
|
||||||
dev_dbg(dev->class_dev, "I/O base=0x%04lx\n", dev->iobase);
|
dev_dbg(dev->class_dev, "I/O base=0x%04lx\n", dev->iobase);
|
||||||
|
|
||||||
|
@ -461,23 +468,14 @@ static int das16cs_attach(struct comedi_device *dev,
|
||||||
for (i = 0; i < 48; i += 2)
|
for (i = 0; i < 48; i += 2)
|
||||||
dev_dbg(dev->class_dev, "%04x\n", inw(dev->iobase + i));
|
dev_dbg(dev->class_dev, "%04x\n", inw(dev->iobase + i));
|
||||||
|
|
||||||
|
|
||||||
ret = request_irq(link->irq, das16cs_interrupt,
|
ret = request_irq(link->irq, das16cs_interrupt,
|
||||||
IRQF_SHARED, "cb_das16_cs", dev);
|
IRQF_SHARED, "cb_das16_cs", dev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
dev->irq = link->irq;
|
dev->irq = link->irq;
|
||||||
|
|
||||||
dev_dbg(dev->class_dev, "irq=%u\n", dev->irq);
|
dev_dbg(dev->class_dev, "irq=%u\n", dev->irq);
|
||||||
|
|
||||||
dev->board_ptr = das16cs_probe(dev, link);
|
|
||||||
if (!dev->board_ptr)
|
|
||||||
return -EIO;
|
|
||||||
thisboard = comedi_board(dev);
|
|
||||||
|
|
||||||
dev->board_name = thisboard->name;
|
|
||||||
|
|
||||||
if (alloc_private(dev, sizeof(struct das16cs_private)) < 0)
|
if (alloc_private(dev, sizeof(struct das16cs_private)) < 0)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue