From 7cd4941c7c988818853482f9630541e6a55f130f Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 5 Sep 2012 18:49:34 -0700 Subject: [PATCH] --- yaml --- r: 324899 b: refs/heads/master c: 06e915e2ac55afb4989da4fb212150aa67a369ca h: refs/heads/master i: 324897: 11f57c6c3199c9a0a4228e724f69aa777125c389 324895: cae48393a9359529178a7fc8316e70007b1dbd57 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f79870f9298e..c654acc4de6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe2e334a334d032b3c60c47a5a98429ee6d84a53 +refs/heads/master: 06e915e2ac55afb4989da4fb212150aa67a369ca diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c index e27cae0eb8a2..5f713c90d401 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/trunk/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)