From 789479f50ae31d4c81007be125a76add8b79ba93 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 4 Jan 2013 11:33:25 +0000 Subject: [PATCH] --- yaml --- r: 353955 b: refs/heads/master c: 0642c94bcb2f3f61a3f68e98684a2b2f13f0411d h: refs/heads/master i: 353953: 662c1f6204ae486f8f067452f60ce3cdb160cc14 353951: cfd76ce2a40fe6bb21aa8079cdc092eb6e3320e8 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/comedi_test.c | 20 +++++++------------ 2 files changed, 8 insertions(+), 14 deletions(-) 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); } }