Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f05ffb6e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: das800: allow attaching without interrupt support 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 77630119

drivers/staging/comedi/drivers/das800.c

+6 −14
Original line number Diff line number Diff line
@@ -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->board_name = thisboard->name;

	}



	ret = comedi_alloc_subdevices(dev, 3);

	if (ret)