From 31eaca320185f9f965a1ce9bd81b3fafac8f3db1 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 17 Sep 2012 13:17:03 -0700 Subject: [PATCH] --- yaml --- r: 325395 b: refs/heads/master c: 920e2ffbe243fb0555b2c238e26fe7dbc03db98c h: refs/heads/master i: 325393: caf9895fc5788234af0a139374e085b61a4f34ae 325391: d0355d7db94ce9029a6d34b897c007d13ee82502 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcmuio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 96811825b530..2b315546410f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 765c3c64f76a786cd01f3b479ee63b79cb9343d0 +refs/heads/master: 920e2ffbe243fb0555b2c238e26fe7dbc03db98c diff --git a/trunk/drivers/staging/comedi/drivers/pcmuio.c b/trunk/drivers/staging/comedi/drivers/pcmuio.c index aba6b4516c5f..0e32119bc3f9 100644 --- a/trunk/drivers/staging/comedi/drivers/pcmuio.c +++ b/trunk/drivers/staging/comedi/drivers/pcmuio.c @@ -442,7 +442,7 @@ static void pcmuio_stop_intr(struct comedi_device *dev, subpriv->intr.enabled_mask = 0; subpriv->intr.active = 0; - s->async->inttrig = 0; + s->async->inttrig = NULL; nports = subpriv->intr.num_asic_chans / CHANS_PER_PORT; firstport = subpriv->intr.asic_chan / CHANS_PER_PORT; switch_page(dev, asic, PAGE_ENAB); @@ -683,7 +683,7 @@ pcmuio_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s, return -EINVAL; spin_lock_irqsave(&subpriv->intr.spinlock, flags); - s->async->inttrig = 0; + s->async->inttrig = NULL; if (subpriv->intr.active) event = pcmuio_start_intr(dev, s);