diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-27 14:57:25 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-27 14:57:25 +0000 |
| commit | 51ad557e21b8713f3abc286c14bca4ed01b8e56d (patch) | |
| tree | 357ddab632db8023c5b534309269b20fd50346e3 /drivers/staging/comedi/drivers/adl_pci9111.c | |
| parent | 9d069f462c65190c5116e750e7b376793cd32a15 (diff) | |
| parent | 020abbc91120ddf052e2c303a8c598c3be4dc459 (diff) | |
Merge tag 'v3.10.28' into linux-linaro-lsklsk-14.01
This is the 3.10.28 stable release
Diffstat (limited to 'drivers/staging/comedi/drivers/adl_pci9111.c')
| -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 6247fdcedcb..71043a1c850 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, pci9111_reset(dev); if (pcidev->irq > 0) { - ret = request_irq(dev->irq, pci9111_interrupt, + ret = request_irq(pcidev->irq, pci9111_interrupt, IRQF_SHARED, dev->board_name, dev); if (ret) return ret; |