From 14aac42b0a1a75e423a9b57c264f0ce0d3827545 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 5 Sep 2012 18:36:03 -0700
Subject: [PATCH] --- yaml --- r: 324863 b: refs/heads/master c:
 9b7beb661377e4bc8e6fdd02342d94caf51491cd h: refs/heads/master i:   324861:
 86e0529a013b4636ca39c6ae98e2bac31c5d6636   324859:
 ed95fa69aeeacfdf4e18a30e97f8d4a88b0f5967   324855:
 bf0aaf184d367fb53494f5e1af0644284ccf0a94   324847:
 2c44669546513024b362ee2c33fc4faf0615f2e0   324831:
 07e7c27ffc7ed757475741c869f6d72091ced43a   324799:
 d3a6042e450bf385cc56bc86e6e93a9a72fe6e92   324735:
 970dc653be2a18c15b35d044d8dd930d16275c64   324607:
 3e275cd4f18a97bb227afd80f3923e91e3e4b40f v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/staging/comedi/drivers/das16m1.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8cccab5ca129..aef59d9ea739 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35d10629f19570cd0d9e7b4485f027f300a12d33
+refs/heads/master: 9b7beb661377e4bc8e6fdd02342d94caf51491cd
diff --git a/trunk/drivers/staging/comedi/drivers/das16m1.c b/trunk/drivers/staging/comedi/drivers/das16m1.c
index 200926347861..7f0668f8ed83 100644
--- a/trunk/drivers/staging/comedi/drivers/das16m1.c
+++ b/trunk/drivers/staging/comedi/drivers/das16m1.c
@@ -650,7 +650,7 @@ static int das16m1_attach(struct comedi_device *dev,
 	if (ret)
 		return ret;
 
-	s = dev->subdevices + 0;
+	s = &dev->subdevices[0];
 	dev->read_subdev = s;
 	/* ai */
 	s->type = COMEDI_SUBD_AI;
@@ -666,7 +666,7 @@ static int das16m1_attach(struct comedi_device *dev,
 	s->cancel = das16m1_cancel;
 	s->poll = das16m1_poll;
 
-	s = dev->subdevices + 1;
+	s = &dev->subdevices[1];
 	/* di */
 	s->type = COMEDI_SUBD_DI;
 	s->subdev_flags = SDF_READABLE;
@@ -675,7 +675,7 @@ static int das16m1_attach(struct comedi_device *dev,
 	s->range_table = &range_digital;
 	s->insn_bits = das16m1_di_rbits;
 
-	s = dev->subdevices + 2;
+	s = &dev->subdevices[2];
 	/* do */
 	s->type = COMEDI_SUBD_DO;
 	s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
@@ -684,7 +684,7 @@ static int das16m1_attach(struct comedi_device *dev,
 	s->range_table = &range_digital;
 	s->insn_bits = das16m1_do_wbits;
 
-	s = dev->subdevices + 3;
+	s = &dev->subdevices[3];
 	/* 8255 */
 	subdev_8255_init(dev, s, NULL, dev->iobase + DAS16M1_82C55);
 
@@ -707,7 +707,7 @@ static int das16m1_attach(struct comedi_device *dev,
 static void das16m1_detach(struct comedi_device *dev)
 {
 	if (dev->subdevices)
-		subdev_8255_cleanup(dev, dev->subdevices + 3);
+		subdev_8255_cleanup(dev, &dev->subdevices[3]);
 	if (dev->irq)
 		free_irq(dev->irq, dev);
 	if (dev->iobase) {