diff options
-rw-r--r-- | scripts/kconfig/mconf.c | 4 | ||||
-rw-r--r-- | tools/perf/ui/hist.c | 4 | ||||
-rw-r--r-- | tools/thermal/tmon/sysfs.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 14cea7463a62..4dd37552abc2 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -330,10 +330,10 @@ static void set_subtitle(void) | |||
330 | list_for_each_entry(sp, &trail, entries) { | 330 | list_for_each_entry(sp, &trail, entries) { |
331 | if (sp->text) { | 331 | if (sp->text) { |
332 | if (pos) { | 332 | if (pos) { |
333 | pos->next = xcalloc(sizeof(*pos), 1); | 333 | pos->next = xcalloc(1, sizeof(*pos)); |
334 | pos = pos->next; | 334 | pos = pos->next; |
335 | } else { | 335 | } else { |
336 | subtitles = pos = xcalloc(sizeof(*pos), 1); | 336 | subtitles = pos = xcalloc(1, sizeof(*pos)); |
337 | } | 337 | } |
338 | pos->text = sp->text; | 338 | pos->text = sp->text; |
339 | } | 339 | } |
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index 2af18376b077..dc0d095f318c 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c | |||
@@ -162,8 +162,8 @@ static int __hpp__sort(struct hist_entry *a, struct hist_entry *b, | |||
162 | return ret; | 162 | return ret; |
163 | 163 | ||
164 | nr_members = evsel->nr_members; | 164 | nr_members = evsel->nr_members; |
165 | fields_a = calloc(sizeof(*fields_a), nr_members); | 165 | fields_a = calloc(nr_members, sizeof(*fields_a)); |
166 | fields_b = calloc(sizeof(*fields_b), nr_members); | 166 | fields_b = calloc(nr_members, sizeof(*fields_b)); |
167 | 167 | ||
168 | if (!fields_a || !fields_b) | 168 | if (!fields_a || !fields_b) |
169 | goto out; | 169 | goto out; |
diff --git a/tools/thermal/tmon/sysfs.c b/tools/thermal/tmon/sysfs.c index dfe454855cd2..1c12536f2081 100644 --- a/tools/thermal/tmon/sysfs.c +++ b/tools/thermal/tmon/sysfs.c | |||
@@ -446,7 +446,7 @@ int probe_thermal_sysfs(void) | |||
446 | return -1; | 446 | return -1; |
447 | } | 447 | } |
448 | 448 | ||
449 | ptdata.tzi = calloc(sizeof(struct tz_info), ptdata.max_tz_instance+1); | 449 | ptdata.tzi = calloc(ptdata.max_tz_instance+1, sizeof(struct tz_info)); |
450 | if (!ptdata.tzi) { | 450 | if (!ptdata.tzi) { |
451 | fprintf(stderr, "Err: allocate tz_info\n"); | 451 | fprintf(stderr, "Err: allocate tz_info\n"); |
452 | return -1; | 452 | return -1; |
@@ -454,8 +454,8 @@ int probe_thermal_sysfs(void) | |||
454 | 454 | ||
455 | /* we still show thermal zone information if there is no cdev */ | 455 | /* we still show thermal zone information if there is no cdev */ |
456 | if (ptdata.nr_cooling_dev) { | 456 | if (ptdata.nr_cooling_dev) { |
457 | ptdata.cdi = calloc(sizeof(struct cdev_info), | 457 | ptdata.cdi = calloc(ptdata.max_cdev_instance + 1, |
458 | ptdata.max_cdev_instance + 1); | 458 | sizeof(struct cdev_info)); |
459 | if (!ptdata.cdi) { | 459 | if (!ptdata.cdi) { |
460 | free(ptdata.tzi); | 460 | free(ptdata.tzi); |
461 | fprintf(stderr, "Err: allocate cdev_info\n"); | 461 | fprintf(stderr, "Err: allocate cdev_info\n"); |