This member of the private data is a copy of the cmd->chanlist. Use that
instead.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/addi-data/addi_common.h    | 1 -
 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h 
b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index 9e00410..9978f13 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -121,7 +121,6 @@ struct addi_private {
        unsigned char b_AiContinuous;   /*  we do unlimited AI */
        unsigned int ui_AiActualScan;   /* how many scans we finished */
        unsigned int ui_AiNbrofChannels;        /*  how many channels is 
measured */
-       unsigned int *pui_AiChannelList;        /*  actual chanlist */
        unsigned int ui_AiChannelList[32];      /*  actual chanlist */
        unsigned int ui_AiReadData[32];
        unsigned int ui_AiTimer0;       /* Timer Constant for Timer0 */
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c 
b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 5021212..e6de79c 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -901,7 +901,7 @@ static int apci3120_cyclic_ai(int mode,
        /* Initializes the sequence array */
    /**********************************/
        if (!apci3120_setup_chan_list(dev, s, devpriv->ui_AiNbrofChannels,
-                       devpriv->pui_AiChannelList, 0))
+                       cmd->chanlist, 0))
                return -EINVAL;
 
        us_TmpValue = (unsigned short) inw(dev->iobase + APCI3120_RD_STATUS);
@@ -1338,7 +1338,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
 
        /* loading private structure with cmd structure inputs */
        devpriv->ui_AiNbrofChannels = cmd->chanlist_len;
-       devpriv->pui_AiChannelList = cmd->chanlist;
 
        /* UPDATE-0.7.57->0.7.68devpriv->ui_AiDataLength=s->async->data_len; */
        devpriv->ui_AiDataLength = s->async->prealloc_bufsz;
-- 
1.9.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to