---

yaml --- r: 324646 b: refs/heads/master c: 06331fb h: refs/heads/master v: v3
git-mirror · Sep 4, 2012 · b745bed · b745bed
1 parent f2c5c0b
commit b745bed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8d0f3ae8c9945b740983991009513df74dbc949
+refs/heads/master: 06331fb0901519b846ebae347f9eeb65860361c7
diff --git a/trunk/drivers/staging/comedi/drivers/comedi_parport.c b/trunk/drivers/staging/comedi/drivers/comedi_parport.c
@@ -265,8 +265,6 @@ static int parport_intr_cancel(struct comedi_device *dev,
 {
 	struct parport_private *devpriv = dev->private;
 
-	printk(KERN_DEBUG "parport_intr_cancel()\n");
-
 	devpriv->c_data &= ~0x10;
 	outb(devpriv->c_data, dev->iobase + PARPORT_C);
 
@@ -281,10 +279,8 @@ static irqreturn_t parport_interrupt(int irq, void *d)
 	struct parport_private *devpriv = dev->private;
 	struct comedi_subdevice *s = dev->subdevices + 3;
 
-	if (!devpriv->enable_irq) {
-		printk(KERN_ERR "comedi_parport: bogus irq, ignored\n");
+	if (!devpriv->enable_irq)
 		return IRQ_NONE;
-	}
 
 	comedi_buf_put(s->async, 0);
 	s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;