Merge tag 'fixes-3.10-4' of git://git.infradead.org/users/jcooper/linux into fixes

[firefly-linux-kernel-4.4.55.git] / drivers / staging / comedi / drivers / ni_daq_dio24.c

diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index e1cc9d01f2000a9cadd10137cf3ce25ba05abbb1..9b7805fda93252c7162f5c87b7005494ee470942 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -52,8 +52,6 @@ static int dio24_auto_attach(struct comedi_device *dev,
        struct comedi_subdevice *s;
        int ret;
 
-       dev->board_name = dev->driver->driver_name;
-
        link->config_flags |= CONF_AUTO_SET_IO;
        ret = comedi_pcmcia_enable(dev, NULL);
        if (ret)
@@ -75,8 +73,7 @@ static int dio24_auto_attach(struct comedi_device *dev,
 
 static void dio24_detach(struct comedi_device *dev)
 {
-       if (dev->subdevices)
-               subdev_8255_cleanup(dev, &dev->subdevices[0]);
+       comedi_spriv_free(dev, 0);
        comedi_pcmcia_disable(dev);
 }