Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block

[linux.git] / drivers / cpufreq / powernv-cpufreq.c

diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
index 6061850e59c90e012cf8765cde1f9b91c3e35aea..56f4bc0d209ec44a1d0122b74c790a8adf620942 100644 (file)
--- a/drivers/cpufreq/powernv-cpufreq.c
+++ b/drivers/cpufreq/powernv-cpufreq.c
@@ -1041,9 +1041,14 @@ static struct cpufreq_driver powernv_cpufreq_driver = {
 
 static int init_chip_info(void)
 {
-       unsigned int chip[256];
+       unsigned int *chip;
        unsigned int cpu, i;
        unsigned int prev_chip_id = UINT_MAX;
+       int ret = 0;
+
+       chip = kcalloc(num_possible_cpus(), sizeof(*chip), GFP_KERNEL);
+       if (!chip)
+               return -ENOMEM;
 
        for_each_possible_cpu(cpu) {
                unsigned int id = cpu_to_chip_id(cpu);
@@ -1055,8 +1060,10 @@ static int init_chip_info(void)
        }
 
        chips = kcalloc(nr_chips, sizeof(struct chip), GFP_KERNEL);
-       if (!chips)
-               return -ENOMEM;
+       if (!chips) {
+               ret = -ENOMEM;
+               goto free_and_return;
+       }
 
        for (i = 0; i < nr_chips; i++) {
                chips[i].id = chip[i];
@@ -1066,7 +1073,9 @@ static int init_chip_info(void)
                        per_cpu(chip_info, cpu) =  &chips[i];
        }
 
-       return 0;
+free_and_return:
+       kfree(chip);
+       return ret;
 }
 
 static inline void clean_chip_info(void)