From b40bbc533cc611dfd6b3fdc53a970ed98c97d9a2 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 5 Sep 2012 18:45:45 -0700 Subject: [PATCH] --- yaml --- r: 324887 b: refs/heads/master c: f6e5602710ca71fd7084dc923c6ed22892df20c7 h: refs/heads/master i: 324885: c26cdf7c90f7ad7d307ec8bedd9e9bf2e53296b9 324883: 3fa8ca9e6e6cb9e8f211c2fd53eb177491abc352 324879: b9891e569d0a793fca04eae4151383102da000f9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/me_daq.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 07cf9479d77b..ab349510866e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc1acb209e77e698182bb167f49b5763211f4010 +refs/heads/master: f6e5602710ca71fd7084dc923c6ed22892df20c7 diff --git a/trunk/drivers/staging/comedi/drivers/me_daq.c b/trunk/drivers/staging/comedi/drivers/me_daq.c index b028eb853b0c..c68c407feb56 100644 --- a/trunk/drivers/staging/comedi/drivers/me_daq.c +++ b/trunk/drivers/staging/comedi/drivers/me_daq.c @@ -758,7 +758,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it) if (error) return error; - s = dev->subdevices + 0; + s = &dev->subdevices[0]; s->type = COMEDI_SUBD_AI; s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_CMD_READ; s->n_chan = board->ai_channel_nbr; @@ -770,7 +770,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->do_cmdtest = me_ai_do_cmd_test; s->do_cmd = me_ai_do_cmd; - s = dev->subdevices + 1; + s = &dev->subdevices[1]; s->type = COMEDI_SUBD_AO; s->subdev_flags = SDF_WRITEABLE | SDF_COMMON; s->n_chan = board->ao_channel_nbr; @@ -780,7 +780,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_read = me_ao_insn_read; s->insn_write = me_ao_insn_write; - s = dev->subdevices + 2; + s = &dev->subdevices[2]; s->type = COMEDI_SUBD_DIO; s->subdev_flags = SDF_READABLE | SDF_WRITEABLE; s->n_chan = board->dio_channel_nbr;