diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-02-06 14:12:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-06 13:39:38 -0800 |
| commit | a9d50943b80803bfeca18632d75645062e02f133 (patch) | |
| tree | 1cafc8650d3f55d6597866d3e4b49994f2a08516 | |
| parent | 82e9ee616a89f152f42c7051c5f9f5f0d7663652 (diff) | |
staging: comedi: quatech_daqp_cs: fix build error
The kbuild test robot reported a build error in this driver caused by:
commit: a3ac95195b020a0a8fa2a9b0649145324ba64c83
staging: comedi: comedi_pcmcia: allow drivers to use a custom conf_check()
This commit changed the comedi_pcmcia_enable() function so that it now
takes two arguments. The new argument is an optional (*conf_check)
function that is passed to pcmcia_loop_config().
This driver uses the default (*conf_check) in comedi_pcmcia.c so just
pass a NULL as the second arg.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 6ab9083a032f..911eb6b32296 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -723,7 +723,7 @@ static int daqp_auto_attach(struct comedi_device *dev, dev->private = devpriv; link->config_flags |= CONF_AUTO_SET_IO | CONF_ENABLE_IRQ; - ret = comedi_pcmcia_enable(dev); + ret = comedi_pcmcia_enable(dev, NULL); if (ret) return ret; dev->iobase = link->resource[0]->start; |