Skip to content

Commit

Permalink
staging: comedi: s626: cleanup request_irq in s626_attach_pci()
Browse files Browse the repository at this point in the history
Only set dev->irq if request_irq is successfull.

Remove the kernel message noise.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: 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 Sep 26, 2012
1 parent b704789 commit 8c7e427
Showing 1 changed file with 8 additions and 15 deletions.
23 changes: 8 additions & 15 deletions drivers/staging/comedi/drivers/s626.c
Original file line number Diff line number Diff line change
Expand Up @@ -2503,25 +2503,18 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
if (ret)
return ret;

ret = comedi_alloc_subdevices(dev, 6);
if (ret)
return ret;

dev->irq = pcidev->irq;

/* set up interrupt handler */
if (dev->irq == 0) {
printk(KERN_ERR " unknown irq (bad)\n");
} else {
ret = request_irq(dev->irq, s626_irq_handler, IRQF_SHARED,
if (pcidev->irq) {
ret = request_irq(pcidev->irq, s626_irq_handler, IRQF_SHARED,
dev->board_name, dev);

if (ret < 0) {
printk(KERN_ERR " irq not available\n");
dev->irq = 0;
}
if (ret == 0)
dev->irq = pcidev->irq;
}

ret = comedi_alloc_subdevices(dev, 6);
if (ret)
return ret;

s = dev->subdevices + 0;
/* analog input subdevice */
dev->read_subdev = s;
Expand Down

0 comments on commit 8c7e427

Please sign in to comment.