Interrupts are only needed by this driver to support the analog input async
commands. Don't hook up the command support if pcmcia_request_irq() fails
instead of completely failing the (*auto_attach).

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/quatech_daqp_cs.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c 
b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index b2dfc93..7c17a1c 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -670,25 +670,28 @@ static int daqp_auto_attach(struct comedi_device *dev,
 
        link->priv = dev;
        ret = pcmcia_request_irq(link, daqp_interrupt);
-       if (ret)
-               return ret;
+       if (ret == 0)
+               dev->irq = link->irq;
 
        ret = comedi_alloc_subdevices(dev, 4);
        if (ret)
                return ret;
 
        s = &dev->subdevices[0];
-       dev->read_subdev = s;
        s->type         = COMEDI_SUBD_AI;
-       s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF | SDF_CMD_READ;
+       s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF;
        s->n_chan       = 8;
-       s->len_chanlist = 2048;
        s->maxdata      = 0xffff;
        s->range_table  = &range_daqp_ai;
        s->insn_read    = daqp_ai_insn_read;
-       s->do_cmdtest   = daqp_ai_cmdtest;
-       s->do_cmd       = daqp_ai_cmd;
-       s->cancel       = daqp_ai_cancel;
+       if (dev->irq) {
+               dev->read_subdev = s;
+               s->subdev_flags |= SDF_CMD_READ;
+               s->len_chanlist = 2048;
+               s->do_cmdtest   = daqp_ai_cmdtest;
+               s->do_cmd       = daqp_ai_cmd;
+               s->cancel       = daqp_ai_cancel;
+       }
 
        s = &dev->subdevices[1];
        s->type         = COMEDI_SUBD_AO;
-- 
2.5.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to