Cc: Ian Abbott <[email protected]>
Cc: Frank Mori Hess <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/comedi/drivers/amplc_dio200.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c 
b/drivers/staging/comedi/drivers/amplc_dio200.c
index 6a87652..8eb6765 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -661,7 +661,7 @@ dio200_inttrig_start_intr(struct comedi_device *dev, struct 
comedi_subdevice *s,
        subpriv = s->private;
 
        spin_lock_irqsave(&subpriv->spinlock, flags);
-       s->async->inttrig = 0;
+       s->async->inttrig = NULL;
        if (subpriv->active)
                event = dio200_start_intr(dev, s);
 
@@ -1364,7 +1364,7 @@ static int dio200_attach(struct comedi_device *dev, 
struct comedi_devconfig *it)
                        break;
                case sd_8255:
                        /* digital i/o subdevice (8255) */
-                       ret = subdev_8255_init(dev, s, 0,
+                       ret = subdev_8255_init(dev, s, NULL,
                                               iobase + layout->sdinfo[n]);
                        if (ret < 0)
                                return ret;
-- 
1.7.0.3

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to