---

yaml --- r: 337533 b: refs/heads/master c: ae0e3b8 h: refs/heads/master i: 337531: 595737f v: v3
git-mirror · Nov 1, 2012 · fd459d6 · fd459d6
1 parent dff54a7
commit fd459d6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 342481929705695b0cae6c75ed7180ef5143feff
+refs/heads/master: ae0e3b8b159499658dabe54753b5d306045928db
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -367,7 +367,6 @@ static int addi_attach_pci(struct comedi_device *dev,
 	}
 
 	i_ADDI_Reset(dev);
-	devpriv->b_ValidDriver = 1;
 	return 0;
 }
 
@@ -378,7 +377,7 @@ static void i_ADDI_Detach(struct comedi_device *dev)
 	struct addi_private *devpriv = dev->private;
 
 	if (devpriv) {
-		if (devpriv->b_ValidDriver)
+		if (dev->iobase)
 			i_ADDI_Reset(dev);
 		if (dev->irq)
 			free_irq(dev->irq, dev);

diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.h b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -312,7 +312,6 @@ struct addi_private {
 	int i_IobaseAddon;	/* addon base address */
 	int i_IobaseReserved;
 	void __iomem *dw_AiBase;
-	unsigned char b_ValidDriver;	/*  driver is ok */
 	unsigned char b_AiContinuous;	/*  we do unlimited AI */
 	unsigned char b_AiInitialisation;
 	unsigned int ui_AiActualScan;	/* how many scans we finished */