From dd3909e98eec94c69c4147e3aec6e905db47d868 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 5 Sep 2012 18:24:34 -0700 Subject: [PATCH] --- yaml --- r: 324829 b: refs/heads/master c: 630b713b2730dfede5f7ebe3273fae82d8c51bc6 h: refs/heads/master i: 324827: f9729ffed18b514094832b39fd84a507454971e3 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adl_pci7296.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3909cbd55cee..6b104c5bce1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f6115a4875f3192658e8b7f63e4197cc36aec78 +refs/heads/master: 630b713b2730dfede5f7ebe3273fae82d8c51bc6 diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci7296.c b/trunk/drivers/staging/comedi/drivers/adl_pci7296.c index 67233be8c7d6..96cfc9cd4a30 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci7296.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci7296.c @@ -121,7 +121,7 @@ static int adl_pci7296_attach_pci(struct comedi_device *dev, return ret; for (i = 0; i < board->nsubdevs; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; ret = subdev_8255_init(dev, s, NULL, dev->iobase + (i * 4)); if (ret) return ret; @@ -142,7 +142,7 @@ static void adl_pci7296_detach(struct comedi_device *dev) if (dev->subdevices) { for (i = 0; i < board->nsubdevs; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; subdev_8255_cleanup(dev, s); } }