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/das08_cs.c | |
| parent | staging: comedi: ni_labpc_cs: use comedi_pcmcia_{enable,disable} (diff) | |
| download | linux-dev-a3ac95195b020a0a8fa2a9b0649145324ba64c83.tar.xz linux-dev-a3ac95195b020a0a8fa2a9b0649145324ba64c83.zip | |
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/das08_cs.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/das08_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c index 818a609b0dba..cfeebe4d1ddd 100644 --- a/drivers/staging/comedi/drivers/das08_cs.c +++ b/drivers/staging/comedi/drivers/das08_cs.c @@ -81,7 +81,7 @@ static int das08_cs_auto_attach(struct comedi_device *dev, dev->board_ptr = &das08_cs_boards[0]; link->config_flags |= CONF_AUTO_SET_IO; - ret = comedi_pcmcia_enable(dev); + ret = comedi_pcmcia_enable(dev, NULL); if (ret) return ret; iobase = link->resource[0]->start; |