From 3278898365b5c1e7f14767d47ad5519fbd105ce1 Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Sun, 12 Sep 2010 22:56:35 +0400 Subject: [PATCH] --- yaml --- r: 219869 b: refs/heads/master c: 2503a26554c7e73c544fc97f47c1d41faa88bd07 h: refs/heads/master i: 219867: 739cb236d85bc5cd22b389ddeddcd21681d8f105 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/cb_pcidas64.c | 2 +- trunk/drivers/staging/comedi/drivers/usbdux.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f9fa7e54eb11..d73b9930d27f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cae16a1742ad3cc19f15e78b821b94448e330ad9 +refs/heads/master: 2503a26554c7e73c544fc97f47c1d41faa88bd07 diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c index 9b1dd3cc2120..2583e16cd02a 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c @@ -3078,7 +3078,7 @@ static void handle_ai_interrupt(struct comedi_device *dev, spin_unlock_irqrestore(&dev->spinlock, flags); } /* if we are have all the data, then quit */ - if ((cmd->stop_src == TRIG_COUNT && priv(dev)->ai_count <= 0) || + if ((cmd->stop_src == TRIG_COUNT && (int)priv(dev)->ai_count <= 0) || (cmd->stop_src == TRIG_EXT && (status & ADC_STOP_BIT))) { async->events |= COMEDI_CB_EOA; } diff --git a/trunk/drivers/staging/comedi/drivers/usbdux.c b/trunk/drivers/staging/comedi/drivers/usbdux.c index 4b320b1ff823..6131e2dd0591 100644 --- a/trunk/drivers/staging/comedi/drivers/usbdux.c +++ b/trunk/drivers/staging/comedi/drivers/usbdux.c @@ -649,7 +649,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb) /* normal operation: executing a command in this subdevice */ this_usbduxsub->ao_counter--; - if (this_usbduxsub->ao_counter <= 0) { + if ((int)this_usbduxsub->ao_counter <= 0) { /* timer zero */ this_usbduxsub->ao_counter = this_usbduxsub->ao_timer;