Browse Source

staging: comedi: adv_pci_dio: disable channel freeze outside of switch

For aesthetics, move the disable of the channel freeze for the PCI-1752
and PCI-1756 boards out of the switch used to disable and clear interrupts.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten 9 years ago
parent
commit
c94a5991bf
1 changed files with 4 additions and 6 deletions
  1. 4 6
      drivers/staging/comedi/drivers/adv_pci_dio.c

+ 4 - 6
drivers/staging/comedi/drivers/adv_pci_dio.c

@@ -303,6 +303,10 @@ static int pci_dio_reset(struct comedi_device *dev)
 {
 	const struct dio_boardtype *board = dev->board_ptr;
 
+	/* disable channel freeze function on the PCI-1752/1756 boards */
+	if (board->cardtype == TYPE_PCI1752 || board->cardtype == TYPE_PCI1756)
+		outw(0, dev->iobase + PCI1752_6_CFC);
+
 	switch (board->cardtype) {
 	case TYPE_PCI1730:
 	case TYPE_PCI1733:
@@ -330,10 +334,6 @@ static int pci_dio_reset(struct comedi_device *dev)
 		/* disable & clear interrupts */
 		outb(0x88, dev->iobase + PCI1750_ICR);
 		break;
-	case TYPE_PCI1752:
-		outw(0, dev->iobase + PCI1752_6_CFC); /* disable channel freeze
-						       * function */
-		break;
 	case TYPE_PCI1753E:
 		outb(0x88, dev->iobase + PCI1753E_ICR0); /* disable & clear
 							  * interrupts */
@@ -356,8 +356,6 @@ static int pci_dio_reset(struct comedi_device *dev)
 		outw(0x08, dev->iobase + PCI1754_ICR3);
 		break;
 	case TYPE_PCI1756:
-		outw(0, dev->iobase + PCI1752_6_CFC); /* disable channel freeze
-						       * function */
 		outw(0x08, dev->iobase + PCI1754_6_ICR0); /* disable and clear
 							   * interrupts */
 		outw(0x08, dev->iobase + PCI1754_6_ICR1);