From 9f527f34a4c1b0e0337eb2ae6ae3dfd835bfe3f4 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 14 Sep 2012 17:34:30 +0100 Subject: [PATCH] --- yaml --- r: 325315 b: refs/heads/master c: 604d66ce56ee8b31f32353006554dd6538feefb0 h: refs/heads/master i: 325313: fedcbecf7fa57cbac865c16eb6bcb05de73acb3f 325311: 5b468432b42548025fdc7dc898fdad6ac9ccc5ec v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_670x.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9e1332c90b07..4c2ac016fb23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bc42c22289bb431d613082c869193ef16112ba3 +refs/heads/master: 604d66ce56ee8b31f32353006554dd6538feefb0 diff --git a/trunk/drivers/staging/comedi/drivers/ni_670x.c b/trunk/drivers/staging/comedi/drivers/ni_670x.c index fb83625065f5..eac6dc047bb0 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_670x.c +++ b/trunk/drivers/staging/comedi/drivers/ni_670x.c @@ -228,7 +228,6 @@ static int __devinit ni_670x_attach_pci(struct comedi_device *dev, return ret; } dev->board_name = thisboard->name; - dev->irq = mite_irq(devpriv->mite); ret = comedi_alloc_subdevices(dev, 2); if (ret) @@ -293,8 +292,6 @@ static void ni_670x_detach(struct comedi_device *dev) mite_unsetup(devpriv->mite); mite_free(devpriv->mite); } - if (dev->irq) - free_irq(dev->irq, dev); } static struct comedi_driver ni_670x_driver = {