From 1c1946e2fdb7554085aab0a54f6daee22dca6b39 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 5 Sep 2012 18:28:00 -0700 Subject: [PATCH] --- yaml --- r: 324839 b: refs/heads/master c: a2b7bcac20ca917b481c2ac5941c339d06b6d211 h: refs/heads/master i: 324837: d14fbf7280da94176cb5b5bee314a856e758004d 324835: ee60e3aadc909addae72e75ab57c5389c594994b 324831: 07e7c27ffc7ed757475741c869f6d72091ced43a v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adv_pci_dio.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 72446af20cae..d3ce6a91429e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b36ab6c6f6931509b0445e8e229162ef004c61e +refs/heads/master: a2b7bcac20ca917b481c2ac5941c339d06b6d211 diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci_dio.c b/trunk/drivers/staging/comedi/drivers/adv_pci_dio.c index fa5a6a16a0ab..9c9896d01cf1 100644 --- a/trunk/drivers/staging/comedi/drivers/adv_pci_dio.c +++ b/trunk/drivers/staging/comedi/drivers/adv_pci_dio.c @@ -955,9 +955,8 @@ static int pci_dio_reset(struct comedi_device *dev) static int pci1760_attach(struct comedi_device *dev) { struct comedi_subdevice *s; - int subdev = 0; - s = &dev->subdevices[subdev]; + s = &dev->subdevices[0]; s->type = COMEDI_SUBD_DI; s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON; s->n_chan = 8; @@ -965,9 +964,8 @@ static int pci1760_attach(struct comedi_device *dev) s->len_chanlist = 8; s->range_table = &range_digital; s->insn_bits = pci1760_insn_bits_di; - subdev++; - s = &dev->subdevices[subdev]; + s = &dev->subdevices[1]; s->type = COMEDI_SUBD_DO; s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON; s->n_chan = 8; @@ -976,18 +974,16 @@ static int pci1760_attach(struct comedi_device *dev) s->range_table = &range_digital; s->state = 0; s->insn_bits = pci1760_insn_bits_do; - subdev++; - s = &dev->subdevices[subdev]; + s = &dev->subdevices[2]; s->type = COMEDI_SUBD_TIMER; s->subdev_flags = SDF_WRITABLE | SDF_LSAMPL; s->n_chan = 2; s->maxdata = 0xffffffff; s->len_chanlist = 2; /* s->insn_config=pci1760_insn_pwm_cfg; */ - subdev++; - s = &dev->subdevices[subdev]; + s = &dev->subdevices[3]; s->type = COMEDI_SUBD_COUNTER; s->subdev_flags = SDF_READABLE | SDF_WRITABLE; s->n_chan = 8; @@ -996,7 +992,6 @@ static int pci1760_attach(struct comedi_device *dev) s->insn_read = pci1760_insn_cnt_read; s->insn_write = pci1760_insn_cnt_write; /* s->insn_config=pci1760_insn_cnt_cfg; */ - subdev++; return 0; }