From 9c58922d3eb0bc0fccbd840ff1e694a67780d7f5 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Fri, 26 Feb 2010 10:15:08 +0100 Subject: [PATCH] --- yaml --- r: 186841 b: refs/heads/master c: 882e5b32b5d68960f46331215fc3c301df508110 h: refs/heads/master i: 186839: e76376870a08f91050a5cee02c6ea72e518d9b5b v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das800.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 82ab535b265a..8a57ac4b5894 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecd89ddcabf8646651f152155bff5f8bed9c6e92 +refs/heads/master: 882e5b32b5d68960f46331215fc3c301df508110 diff --git a/trunk/drivers/staging/comedi/drivers/das800.c b/trunk/drivers/staging/comedi/drivers/das800.c index ecb97cdbce26..aadc4971c909 100644 --- a/trunk/drivers/staging/comedi/drivers/das800.c +++ b/trunk/drivers/staging/comedi/drivers/das800.c @@ -399,9 +399,8 @@ static irqreturn_t das800_interrupt(int irq, void *d) } else { fifo_empty = 0; /* cio-das802/16 has no fifo empty status bit */ } - if (fifo_empty) { + if (fifo_empty) break; - } /* strip off extraneous bits for 12 bit cards */ if (thisboard->resolution == 12) dataPoint = (dataPoint >> 4) & 0xfff; @@ -457,9 +456,8 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it) int board; printk("comedi%d: das800: io 0x%lx", dev->minor, iobase); - if (irq) { + if (irq) printk(", irq %u", irq); - } printk("\n"); /* allocate and initialize dev->private */