From bf0aaf184d367fb53494f5e1af0644284ccf0a94 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 5 Sep 2012 18:33:19 -0700 Subject: [PATCH] --- yaml --- r: 324855 b: refs/heads/master c: 6807d64d21e0721e9ff8b57c62824f9bcce31a63 h: refs/heads/master i: 324853: 5326923054b42f17aaee04621c654e0a8adc3893 324851: f629ea6b55c2933cc90e9ca98ff0e89b8ac5ac46 324847: 2c44669546513024b362ee2c33fc4faf0615f2e0 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/cb_pcimdda.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e02e4bdb8d6e..7adf005f53cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13201d88114f485ee6f9e66b81eeb436323089d0 +refs/heads/master: 6807d64d21e0721e9ff8b57c62824f9bcce31a63 diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c index ea96514254a1..ba9f0599be28 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c @@ -176,7 +176,7 @@ static int cb_pcimdda_attach_pci(struct comedi_device *dev, if (ret) return ret; - s = dev->subdevices + 0; + s = &dev->subdevices[0]; /* analog output subdevice */ s->type = COMEDI_SUBD_AO; s->subdev_flags = SDF_WRITABLE | SDF_READABLE; @@ -186,7 +186,7 @@ static int cb_pcimdda_attach_pci(struct comedi_device *dev, s->insn_write = cb_pcimdda_ao_winsn; s->insn_read = cb_pcimdda_ao_rinsn; - s = dev->subdevices + 1; + s = &dev->subdevices[1]; /* digital i/o subdevice */ ret = subdev_8255_init(dev, s, NULL, dev->iobase + PCIMDDA_8255_BASE_REG); @@ -203,7 +203,7 @@ static void cb_pcimdda_detach(struct comedi_device *dev) struct pci_dev *pcidev = comedi_to_pci_dev(dev); if (dev->subdevices) - subdev_8255_cleanup(dev, dev->subdevices + 1); + subdev_8255_cleanup(dev, &dev->subdevices[1]); if (pcidev) { if (dev->iobase) comedi_pci_disable(pcidev);