From f20a5576f54c7c1a48edac26525236c53bfb9b41 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 18 Jun 2012 17:03:17 -0700 Subject: [PATCH] --- yaml --- r: 317435 b: refs/heads/master c: 76728a93a70f23c6376c728e337fb26473737e7f h: refs/heads/master i: 317433: a17372fbb6399cdbae1a6a887032d6fcbe06c621 317431: 0f066397747a991d0d5f5aa87e3afa2f859d4104 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcmmio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f0e1ffd43968..b2bf44b67694 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d163a19d915e9bb3dfa01abc251bc4d5395dc118 +refs/heads/master: 76728a93a70f23c6376c728e337fb26473737e7f diff --git a/trunk/drivers/staging/comedi/drivers/pcmmio.c b/trunk/drivers/staging/comedi/drivers/pcmmio.c index 82a60d681eb4..3d2e6f01c4b7 100644 --- a/trunk/drivers/staging/comedi/drivers/pcmmio.c +++ b/trunk/drivers/staging/comedi/drivers/pcmmio.c @@ -512,7 +512,7 @@ static void pcmmio_stop_intr(struct comedi_device *dev, subpriv->dio.intr.enabled_mask = 0; subpriv->dio.intr.active = 0; - s->async->inttrig = 0; + s->async->inttrig = NULL; nports = subpriv->dio.intr.num_asic_chans / CHANS_PER_PORT; firstport = subpriv->dio.intr.asic_chan / CHANS_PER_PORT; switch_page(dev, asic, PAGE_ENAB); @@ -778,7 +778,7 @@ pcmmio_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s, return -EINVAL; spin_lock_irqsave(&subpriv->dio.intr.spinlock, flags); - s->async->inttrig = 0; + s->async->inttrig = NULL; if (subpriv->dio.intr.active) event = pcmmio_start_intr(dev, s); spin_unlock_irqrestore(&subpriv->dio.intr.spinlock, flags);