diff --git a/[refs] b/[refs] index abcdde2caf79..3ad291621ec5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d51d45da3e49262f932ca4567bd39b08b94ebf9f +refs/heads/master: 37fa328f066dc38bf58337b6488232c8cefe37f3 diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c index 32ee22dbb858..e1cc9d01f200 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/trunk/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;