staging: comedi: use kmalloc_array instead of kmalloc

Use kmalloc_array instead of kmalloc to allocate memory for an array.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index b2f7679a01161f4fe6e02a58bfd79aa06a4de215..cac011fdd375d6e93033577738dfafa30c8f179a 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -1022,14 +1022,17 @@ pci224_auto_attach(struct comedi_device *dev, unsigned long context_model)
        irq = pci_dev->irq;
 
        /* Allocate buffer to hold values for AO channel scan. */
-       devpriv->ao_scan_vals = kmalloc(sizeof(devpriv->ao_scan_vals[0]) *
-                                       board->ao_chans, GFP_KERNEL);
+       devpriv->ao_scan_vals = kmalloc_array(board->ao_chans,
+                                             sizeof(devpriv->ao_scan_vals[0]),
+                                             GFP_KERNEL);
        if (!devpriv->ao_scan_vals)
                return -ENOMEM;
 
        /* Allocate buffer to hold AO channel scan order. */
-       devpriv->ao_scan_order = kmalloc(sizeof(devpriv->ao_scan_order[0]) *
-                                        board->ao_chans, GFP_KERNEL);
+       devpriv->ao_scan_order =
+                               kmalloc_array(board->ao_chans,
+                                             sizeof(devpriv->ao_scan_order[0]),
+                                             GFP_KERNEL);
        if (!devpriv->ao_scan_order)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index f4c580f65a896ccbf3100cfcdbbc15b17044e66f..3e72718801a9ea58d1dc6fbe44c97610d858fa01 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -214,8 +214,9 @@ static int ni_670x_auto_attach(struct comedi_device *dev,
        if (s->n_chan == 32) {
                const struct comedi_lrange **range_table_list;
 
-               range_table_list = kmalloc(sizeof(struct comedi_lrange *) * 32,
-                                          GFP_KERNEL);
+               range_table_list = kmalloc_array(32,
+                                                sizeof(struct comedi_lrange *),
+                                                GFP_KERNEL);
                if (!range_table_list)
                        return -ENOMEM;
                s->range_table_list = range_table_list;