diff --git a/[refs] b/[refs] index 798460f9c48b..af0e1f058d9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82e9ee616a89f152f42c7051c5f9f5f0d7663652 +refs/heads/master: a9d50943b80803bfeca18632d75645062e02f133 diff --git a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 6ab9083a032f..911eb6b32296 100644 --- a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/trunk/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;