diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-02-05 18:16:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-05 18:16:19 -0800 |
| commit | a3ac95195b020a0a8fa2a9b0649145324ba64c83 (patch) | |
| tree | e5a234df0486da085ac2945c5a0c7aeccebffbcf /drivers/staging/comedi/drivers/ni_daq_700.c | |
| parent | 4f60f6b69c7741fe97e40f4d5210968162f8b7ad (diff) | |
staging: comedi: comedi_pcmcia: allow drivers to use a custom conf_check()
Allow comedi pcmcia drivers to use a custom conf_check() when calling
comedi_pcmcia_enable() to enable the pcmcia device. If a conf_check()
is not passed the internal comedi_pcmcia_conf_check() will be used.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_daq_700.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_700.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index c8f4c7d2a832..9cc6092eacdd 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -205,7 +205,7 @@ static int daq700_auto_attach(struct comedi_device *dev, dev->board_name = dev->driver->driver_name; link->config_flags |= CONF_AUTO_SET_IO; - ret = comedi_pcmcia_enable(dev); + ret = comedi_pcmcia_enable(dev, NULL); if (ret) return ret; dev->iobase = link->resource[0]->start; |