diff --git a/[refs] b/[refs]
index 240726162538..4a19976e601b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abafc9e851c2319be0f3244af944cc0fa0dd4d6d
+refs/heads/master: 3b00b8570a17b31292d04e41691548fb6d1c2d75
diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c
index b655437b31b0..24fc5cc06603 100644
--- a/trunk/drivers/staging/comedi/drivers/s626.c
+++ b/trunk/drivers/staging/comedi/drivers/s626.c
@@ -732,7 +732,8 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
 	struct comedi_device *dev = d;
 	struct s626_private *devpriv = dev->private;
 	struct comedi_subdevice *s = dev->read_subdev;
-	struct comedi_cmd *cmd = &s->async->cmd;
+	struct comedi_async *async = s->async;
+	struct comedi_cmd *cmd = &async->cmd;
 	struct enc_private *k;
 	unsigned long flags;
 	int32_t *readaddr;
@@ -767,21 +768,21 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
 		readaddr = (int32_t *) devpriv->ANABuf.LogicalBase + 1;
 
 		/*  get the data and hand it over to comedi */
-		for (i = 0; i < (s->async->cmd.chanlist_len); i++) {
+		for (i = 0; i < cmd->chanlist_len; i++) {
 			/*  Convert ADC data to 16-bit integer values and copy to application */
 			/*  buffer. */
 			tempdata = s626_ai_reg_to_uint((int)*readaddr);
 			readaddr++;
 
 			/* put data into read buffer */
-			/*  comedi_buf_put(s->async, tempdata); */
+			/*  comedi_buf_put(async, tempdata); */
 			if (cfc_write_to_buffer(s, tempdata) == 0)
 				printk
 				    ("s626_irq_handler: cfc_write_to_buffer error!\n");
 		}
 
 		/* end of scan occurs */
-		s->async->events |= COMEDI_CB_EOS;
+		async->events |= COMEDI_CB_EOS;
 
 		if (!(devpriv->ai_continous))
 			devpriv->ai_sample_count--;
@@ -792,7 +793,7 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
 			MC_DISABLE(P_MC1, MC1_ERPS1);
 
 			/* send end of acquisition */
-			s->async->events |= COMEDI_CB_EOA;
+			async->events |= COMEDI_CB_EOA;
 
 			/* disable master interrupt */
 			irqstatus = 0;