Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / atm / he.c

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 0f5cb37..31b513a 100644 (file)
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -779,8 +779,9 @@ static int he_init_group(struct he_dev *he_dev, int group)
                  G0_RBPS_BS + (group * 32));
 
        /* bitmap table */
-       he_dev->rbpl_table = kmalloc(BITS_TO_LONGS(RBPL_TABLE_SIZE)
-                                    * sizeof(unsigned long), GFP_KERNEL);
+       he_dev->rbpl_table = kmalloc_array(BITS_TO_LONGS(RBPL_TABLE_SIZE),
+                                          sizeof(*he_dev->rbpl_table),
+                                          GFP_KERNEL);
        if (!he_dev->rbpl_table) {
                hprintk("unable to allocate rbpl bitmap table\n");
                return -ENOMEM;
@@ -788,8 +789,9 @@ static int he_init_group(struct he_dev *he_dev, int group)
        bitmap_zero(he_dev->rbpl_table, RBPL_TABLE_SIZE);
 
        /* rbpl_virt 64-bit pointers */
-       he_dev->rbpl_virt = kmalloc(RBPL_TABLE_SIZE
-                                   * sizeof(struct he_buff *), GFP_KERNEL);
+       he_dev->rbpl_virt = kmalloc_array(RBPL_TABLE_SIZE,
+                                         sizeof(*he_dev->rbpl_virt),
+                                         GFP_KERNEL);
        if (!he_dev->rbpl_virt) {
                hprintk("unable to allocate rbpl virt table\n");
                goto out_free_rbpl_table;