---

yaml --- r: 325315 b: refs/heads/master c: 604d66c h: refs/heads/master i: 325313: fedcbec 325311: 5b46843 v: v3
git-mirror · Sep 17, 2012 · 9f527f3 · 9f527f3
1 parent 06aec98
commit 9f527f3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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 = {