diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-05 15:43:28 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-25 11:27:11 -0500 |
commit | e4832e92ecd957595937e15b0e4b98c8b2b68d1a (patch) | |
tree | a087139856437cf6279b9b3a391a27f00f6f82b1 | |
parent | d687814867c12165eadb676a93af6a1e201ed494 (diff) |
staging: comedi: adl_pci9111: fix incorrect irq passed to request_irq()
commit 48108fe3daa0d142f9b97178fdb23704ea3a407b upstream.
The dev->irq passed to request_irq() will always be 0 when the auto_attach
function is called. The pcidev->irq should be used instead to get the correct
irq number.
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>
-rw-r--r-- | drivers/staging/comedi/drivers/adl_pci9111.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index 6247fdcedcbf..71043a1c8500 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c | |||
@@ -873,7 +873,7 @@ static int pci9111_auto_attach(struct comedi_device *dev, | |||
873 | pci9111_reset(dev); | 873 | pci9111_reset(dev); |
874 | 874 | ||
875 | if (pcidev->irq > 0) { | 875 | if (pcidev->irq > 0) { |
876 | ret = request_irq(dev->irq, pci9111_interrupt, | 876 | ret = request_irq(pcidev->irq, pci9111_interrupt, |
877 | IRQF_SHARED, dev->board_name, dev); | 877 | IRQF_SHARED, dev->board_name, dev); |
878 | if (ret) | 878 | if (ret) |
879 | return ret; | 879 | return ret; |