1 files changed, 42 insertions, 36 deletions

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index cd09c37570bc..4315892740c9 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2459,16 +2459,10 @@ static int s626_allocate_dma_buffers(struct comedi_device *dev)
 
 static void s626_initialize(struct comedi_device *dev)
 {
-/*   uint8_t    PollList; */
-/*   uint16_t   AdcData; */
-/*   uint16_t   StartVal; */
-/*   uint16_t   index; */
-/*   unsigned int data[16]; */
         dma_addr_t pPhysBuf;
         uint16_t chan;
         int i;
 
-
         /*  enab DEBI and audio pins, enable I2C interface. */
         MC_ENABLE(P_MC1, MC1_DEBI | MC1_AUDIO | MC1_I2C);
         /*  Configure DEBI operating mode. */
@@ -2568,38 +2562,50 @@ static void s626_initialize(struct comedi_device *dev)
         /*  RPS program performs no explicit mem writes. */
         WR7146(P_RPS1_TOUT, 0); /*  Disable RPS timeouts. */
 
-        /* SAA7146 BUG WORKAROUND.  Initialize SAA7146 ADC interface
-         * to a known state by invoking ADCs until FB BUFFER 1
-         * register shows that it is correctly receiving ADC data.
-         * This is necessary because the SAA7146 ADC interface does
-         * not start up in a defined state after a PCI reset.
+#if 0
+        /*
+         * SAA7146 BUG WORKAROUND
+         *
+         * Initialize SAA7146 ADC interface to a known state by
+         * invoking ADCs until FB BUFFER 1 register shows that it
+         * is correctly receiving ADC data. This is necessary
+         * because the SAA7146 ADC interface does not start up in
+         * a defined state after a PCI reset.
          */
 
-/*     PollList = EOPL;         // Create a simple polling */
-/*                              // list for analog input */
-/*                              // channel 0. */
-/*     ResetADC( dev, &PollList ); */
-
-/*     s626_ai_rinsn(dev,dev->subdevices,NULL,data); //( &AdcData ); // */
-/*                                                      //Get initial ADC */
-/*                                                      //value. */
-
-/*     StartVal = data[0]; */
-
-/*     // VERSION 2.01 CHANGE: TIMEOUT ADDED TO PREVENT HANGED EXECUTION. */
-/*     // Invoke ADCs until the new ADC value differs from the initial */
-/*     // value or a timeout occurs.  The timeout protects against the */
-/*     // possibility that the driver is restarting and the ADC data is a */
-/*     // fixed value resulting from the applied ADC analog input being */
-/*     // unusually quiet or at the rail. */
-
-/*     for ( index = 0; index < 500; index++ ) */
-/*       { */
-/*      s626_ai_rinsn(dev,dev->subdevices,NULL,data); */
-/*      AdcData = data[0];      //ReadADC(  &AdcData ); */
-/*      if ( AdcData != StartVal ) */
-/*              break; */
-/*       } */
+        {
+        uint8_t PollList;
+        uint16_t AdcData;
+        uint16_t StartVal;
+        uint16_t index;
+        unsigned int data[16];
+
+        /* Create a simple polling list for analog input channel 0 */
+        PollList = EOPL;
+        ResetADC(dev, &PollList);
+
+        /* Get initial ADC value */
+        s626_ai_rinsn(dev, dev->subdevices, NULL, data);
+        StartVal = data[0];
+
+        /*
+         * VERSION 2.01 CHANGE: TIMEOUT ADDED TO PREVENT HANGED EXECUTION.
+         *
+         * Invoke ADCs until the new ADC value differs from the initial
+         * value or a timeout occurs.  The timeout protects against the
+         * possibility that the driver is restarting and the ADC data is a
+         * fixed value resulting from the applied ADC analog input being
+         * unusually quiet or at the rail.
+         */
+        for (index = 0; index < 500; index++) {
+                s626_ai_rinsn(dev, dev->subdevices, NULL, data);
+                AdcData = data[0];
+                if (AdcData != StartVal)
+                        break;
+        }
+
+        }
+#endif  /* SAA7146 BUG WORKAROUND */
 
         /*  end initADC */