diff --git a/[refs] b/[refs]
index 312a7edd905b..1f75efa4ae2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f87a7e5bf50d83d9dca0e87d10eac7226e0ac61d
+refs/heads/master: da7fde2bc902db1133f591b826124c9369857d38
diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
index f3d5ca00f147..acee55023564 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -509,6 +509,8 @@ static int das16cs_attach(struct comedi_device *dev,
 		s->range_table = &range_bipolar10;
 		s->insn_write = &das16cs_ao_winsn;
 		s->insn_read = &das16cs_ao_rinsn;
+	} else {
+		s->type = COMEDI_SUBD_UNUSED;
 	}
 
 	s = dev->subdevices + 2;