Re: [PATCH] tools/thermal: fix calloc argument ordering

From: edubezval@xxxxxxxxx
Date: Mon Aug 18 2014 - 08:38:00 EST


Hello,

On Mon, Aug 18, 2014 at 5:33 AM, Arjun Sreedharan <arjun024@xxxxxxxxx> wrote:
> @number first, @size second argument
>
> Signed-off-by: Arjun Sreedharan <arjun024@xxxxxxxxx>

Acked-by: Eduardo Valentin <edubezval@xxxxxxxxx>

> ---
> tools/thermal/tmon/sysfs.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/thermal/tmon/sysfs.c b/tools/thermal/tmon/sysfs.c
> index dfe4548..1c12536 100644
> --- a/tools/thermal/tmon/sysfs.c
> +++ b/tools/thermal/tmon/sysfs.c
> @@ -446,7 +446,7 @@ int probe_thermal_sysfs(void)
> return -1;
> }
>
> - ptdata.tzi = calloc(sizeof(struct tz_info), ptdata.max_tz_instance+1);
> + ptdata.tzi = calloc(ptdata.max_tz_instance+1, sizeof(struct tz_info));
> if (!ptdata.tzi) {
> fprintf(stderr, "Err: allocate tz_info\n");
> return -1;
> @@ -454,8 +454,8 @@ int probe_thermal_sysfs(void)
>
> /* we still show thermal zone information if there is no cdev */
> if (ptdata.nr_cooling_dev) {
> - ptdata.cdi = calloc(sizeof(struct cdev_info),
> - ptdata.max_cdev_instance + 1);
> + ptdata.cdi = calloc(ptdata.max_cdev_instance + 1,
> + sizeof(struct cdev_info));
> if (!ptdata.cdi) {
> free(ptdata.tzi);
> fprintf(stderr, "Err: allocate cdev_info\n");
> --
> 1.8.1.msysgit.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/



--
Eduardo Bezerra Valentin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/