diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_daq_dio24.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_dio24.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index e27cae0eb8a2..0ca222bbcbe6 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -164,7 +164,7 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it) return ret; /* 8255 dio */ - s = dev->subdevices + 0; + s = &dev->subdevices[0]; subdev_8255_init(dev, s, NULL, dev->iobase); return 0; @@ -172,8 +172,12 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it) static void dio24_detach(struct comedi_device *dev) { - if (dev->subdevices) - subdev_8255_cleanup(dev, dev->subdevices + 0); + struct comedi_subdevice *s; + + if (dev->subdevices) { + s = &dev->subdevices[0]; + subdev_8255_cleanup(dev, s); + } if (thisboard->bustype != pcmcia_bustype && dev->iobase) release_region(dev->iobase, DIO24_SIZE); if (dev->irq) @@ -304,7 +308,7 @@ MODULE_DESCRIPTION("Comedi driver for National Instruments " "PCMCIA DAQ-Card DIO-24"); MODULE_LICENSE("GPL"); -struct pcmcia_driver dio24_cs_driver = { +static struct pcmcia_driver dio24_cs_driver = { .probe = dio24_cs_attach, .remove = dio24_cs_detach, .suspend = dio24_cs_suspend, |