diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-02-07 13:27:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-07 13:59:26 -0800 |
| commit | 37fa328f066dc38bf58337b6488232c8cefe37f3 (patch) | |
| tree | 16f75fabd29dba1f0d72d642ba388bc28036b1bd /drivers | |
| parent | d51d45da3e49262f932ca4567bd39b08b94ebf9f (diff) | |
| download | op-kernel-dev-37fa328f066dc38bf58337b6488232c8cefe37f3.zip op-kernel-dev-37fa328f066dc38bf58337b6488232c8cefe37f3.tar.gz | |
staging: comedi: ni_daq_dio24: add back missing 'if (ret)'
The 'if (ret)' after calling comedi_pcmcia_enable() was accidentally
removed in:
Commit: 573a964882065f9b2cb71db8a225ba067b4b5b7a
staging: comedi: ni_daq_dio24: use comedi_pcmcia_{enable,disable}
Put if back so that dio24_auto_attach() can finish attaching to
the board after enabling the pcmcia device.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_dio24.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index 32ee22d..e1cc9d0 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -56,6 +56,7 @@ static int dio24_auto_attach(struct comedi_device *dev, link->config_flags |= CONF_AUTO_SET_IO; ret = comedi_pcmcia_enable(dev, NULL); + if (ret) return ret; dev->iobase = link->resource[0]->start; |
