diff --git a/[refs] b/[refs]
index 74a06e91791c..8e3a5e4d8d96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bd48c9ef1f1af96dc699e67a8dc985046e6f22b
+refs/heads/master: 0642c94bcb2f3f61a3f68e98684a2b2f13f0411d
diff --git a/trunk/drivers/staging/comedi/drivers/comedi_test.c b/trunk/drivers/staging/comedi/drivers/comedi_test.c
index ce13fbc52ef9..a8e40cae2d79 100644
--- a/trunk/drivers/staging/comedi/drivers/comedi_test.c
+++ b/trunk/drivers/staging/comedi/drivers/comedi_test.c
@@ -203,19 +203,13 @@ static void waveform_ai_interrupt(unsigned long arg)
 
 	for (i = 0; i < num_scans; i++) {
 		for (j = 0; j < cmd->chanlist_len; j++) {
-			cfc_write_to_buffer(dev->read_subdev,
-					    fake_waveform(dev,
-							  CR_CHAN(cmd->
-								  chanlist[j]),
-							  CR_RANGE(cmd->
-								   chanlist[j]),
-							  devpriv->
-							  usec_current +
-							  i *
-							  devpriv->scan_period +
-							  j *
-							  devpriv->
-							  convert_period));
+			unsigned short sample;
+			sample = fake_waveform(dev, CR_CHAN(cmd->chanlist[j]),
+					       CR_RANGE(cmd->chanlist[j]),
+					       devpriv->usec_current +
+						   i * devpriv->scan_period +
+						   j * devpriv->convert_period);
+			cfc_write_to_buffer(dev->read_subdev, sample);
 		}
 	}