diff --git a/[refs] b/[refs]
index bb9f533120cf..cd52918bb00a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc041c20105ad3c4e58905e912eb191dfbc5664d
+refs/heads/master: ca3caabbb192fa8b1faef17830dff12cb1d0fb72
diff --git a/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c b/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c
index b53a4286f8cb..5895d4dce30f 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -832,7 +832,7 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		return ret;
 
 	/* analog input subdevice */
-	s = dev->subdevices + 0;
+	s = &dev->subdevices[0];
 	dev->read_subdev = s;
 	s->type = COMEDI_SUBD_AI;
 	s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_OTHER | SDF_CMD_READ;