From: H Hartley Sweeten Date: Mon, 20 Oct 2014 18:34:27 +0000 (-0700) Subject: staging: comedi: addi_apci_3120: reset the board before hooking up the interrupt X-Git-Tag: firefly_0821_release~176^2~2665^2~799 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=73ef19314649fbd915d39c04de5057ece3b604e4;p=firefly-linux-kernel-4.4.55.git staging: comedi: addi_apci_3120: reset the board before hooking up the interrupt Move the apci3120_reset() call in the (*auto_attach) to ensure that the board is reset before hooking up the interrupt. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index ec6f89b9e99c..3b4fa2ebbc85 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -154,6 +154,8 @@ static int apci3120_auto_attach(struct comedi_device *dev, devpriv->amcc = pci_resource_start(pcidev, 0); devpriv->addon = pci_resource_start(pcidev, 2); + apci3120_reset(dev); + if (pcidev->irq > 0) { ret = request_irq(pcidev->irq, apci3120_interrupt, IRQF_SHARED, dev->board_name, dev); @@ -232,7 +234,6 @@ static int apci3120_auto_attach(struct comedi_device *dev, s->insn_read = apci3120_read_insn_timer; s->insn_config = apci3120_config_insn_timer; - apci3120_reset(dev); return 0; }