From b745bed3516bb6fb1275b3ca364d8132f8890b40 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 20 Aug 2012 14:31:10 -0700 Subject: [PATCH] --- yaml --- r: 324646 b: refs/heads/master c: 06331fb0901519b846ebae347f9eeb65860361c7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/comedi_parport.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6b2fb65e7b89..7a18595bc0b2 100644 --- 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 index 48d529e0f4de..2dce9df24cb4 100644 --- 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;