From 3cb8f748fa90ca1b8555cddf2fd4c2b3104385c0 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 5 Sep 2012 18:21:25 -0700 Subject: [PATCH] --- yaml --- r: 324821 b: refs/heads/master c: 5e4c58ce65103a820c4ca4b4b0bd8609e638cf75 h: refs/heads/master i: 324819: 8308f6c18eac9e89e108f3e08c2718d364b58a3a v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index be1730e88a73..cacb3a517f8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b077f2cd9b63798c676d62e03c85ace094e2d970 +refs/heads/master: 5e4c58ce65103a820c4ca4b4b0bd8609e638cf75 diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index 3153388ab810..5e91444b7d3d 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/drivers/staging/comedi/drivers.c @@ -71,7 +71,7 @@ int comedi_alloc_subdevices(struct comedi_device *dev, int num_subdevices) dev->n_subdevices = num_subdevices; for (i = 0; i < num_subdevices; ++i) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; s->device = dev; s->async_dma_dir = DMA_NONE; spin_lock_init(&s->spin_lock); @@ -88,7 +88,7 @@ static void cleanup_device(struct comedi_device *dev) if (dev->subdevices) { for (i = 0; i < dev->n_subdevices; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; comedi_free_subdevice_minor(s); if (s->async) { comedi_buf_alloc(dev, s, 0); @@ -260,7 +260,7 @@ static int postconfig(struct comedi_device *dev) int ret; for (i = 0; i < dev->n_subdevices; i++) { - s = dev->subdevices + i; + s = &dev->subdevices[i]; if (s->type == COMEDI_SUBD_UNUSED) continue;