Skip to content

Commit

Permalink
staging: comedi: das800: allow attaching without interrupt support
Browse files Browse the repository at this point in the history
Interrupts are only requires for the analog input async command support.

Allow the driver to attach to the board if the request_irq() fails.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 23, 2013
1 parent 7763011 commit f05ffb6
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions drivers/staging/comedi/drivers/das800.c
Original file line number Diff line number Diff line change
Expand Up @@ -737,22 +737,14 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}
dev->board_ptr = das800_boards + board;
thisboard = comedi_board(dev);
dev->board_name = thisboard->name;

/* grab our IRQ */
if (irq == 1 || irq > 7) {
dev_err(dev->class_dev, "irq out of range\n");
return -EINVAL;
}
if (irq) {
if (request_irq(irq, das800_interrupt, 0, "das800", dev)) {
dev_err(dev->class_dev, "unable to allocate irq %u\n",
irq);
return -EINVAL;
}
if (irq > 1 && irq <= 7) {
ret = request_irq(irq, das800_interrupt, 0, dev->board_name,
dev);
if (ret == 0)
dev->irq = irq;
}
dev->irq = irq;

dev->board_name = thisboard->name;

ret = comedi_alloc_subdevices(dev, 3);
if (ret)
Expand Down

0 comments on commit f05ffb6

Please sign in to comment.