Merge tag 'fsi-updates-2018-07-12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / mfd / ab8500-debugfs.c

diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
index 8ba4107..8d652b2 100644 (file)
--- a/drivers/mfd/ab8500-debugfs.c
+++ b/drivers/mfd/ab8500-debugfs.c
@@ -2519,11 +2519,10 @@ static ssize_t ab8500_subscribe_write(struct file *file,
        if (!dev_attr[irq_index])
                return -ENOMEM;
 
-       event_name[irq_index] = kmalloc(count, GFP_KERNEL);
+       event_name[irq_index] = kasprintf(GFP_KERNEL, "%lu", user_val);
        if (!event_name[irq_index])
                return -ENOMEM;
 
-       sprintf(event_name[irq_index], "%lu", user_val);
        dev_attr[irq_index]->show = show_irq;
        dev_attr[irq_index]->store = NULL;
        dev_attr[irq_index]->attr.name = event_name[irq_index];
@@ -2660,18 +2659,18 @@ static int ab8500_debug_probe(struct platform_device *plf)
        ab8500 = dev_get_drvdata(plf->dev.parent);
        num_irqs = ab8500->mask_size;
 
-       irq_count = devm_kzalloc(&plf->dev,
-                                sizeof(*irq_count)*num_irqs, GFP_KERNEL);
+       irq_count = devm_kcalloc(&plf->dev,
+                                num_irqs, sizeof(*irq_count), GFP_KERNEL);
        if (!irq_count)
                return -ENOMEM;
 
-       dev_attr = devm_kzalloc(&plf->dev,
-                               sizeof(*dev_attr)*num_irqs, GFP_KERNEL);
+       dev_attr = devm_kcalloc(&plf->dev,
+                               num_irqs, sizeof(*dev_attr), GFP_KERNEL);
        if (!dev_attr)
                return -ENOMEM;
 
-       event_name = devm_kzalloc(&plf->dev,
-                                 sizeof(*event_name)*num_irqs, GFP_KERNEL);
+       event_name = devm_kcalloc(&plf->dev,
+                                 num_irqs, sizeof(*event_name), GFP_KERNEL);
        if (!event_name)
                return -ENOMEM;