* [PATCH] tools/thermal: fix calloc argument ordering
@ 2014-08-18 9:33 Arjun Sreedharan
2014-08-18 12:37 ` edubezval
2014-08-18 18:18 ` Jacob Pan
0 siblings, 2 replies; 3+ messages in thread
From: Arjun Sreedharan @ 2014-08-18 9:33 UTC (permalink / raw)
To: rui.zhang; +Cc: jacob.jun.pan, linux-kernel
@number first, @size second argument
Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] tools/thermal: fix calloc argument ordering
2014-08-18 9:33 [PATCH] tools/thermal: fix calloc argument ordering Arjun Sreedharan
@ 2014-08-18 12:37 ` edubezval
2014-08-18 18:18 ` Jacob Pan
1 sibling, 0 replies; 3+ messages in thread
From: edubezval @ 2014-08-18 12:37 UTC (permalink / raw)
To: Arjun Sreedharan; +Cc: Zhang Rui, jacob.jun.pan@linux.intel.com, LKML
Hello,
On Mon, Aug 18, 2014 at 5:33 AM, Arjun Sreedharan <arjun024@gmail.com> wrote:
> @number first, @size second argument
>
> Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
Acked-by: Eduardo Valentin <edubezval@gmail.com>
> ---
> 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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
Eduardo Bezerra Valentin
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] tools/thermal: fix calloc argument ordering
2014-08-18 9:33 [PATCH] tools/thermal: fix calloc argument ordering Arjun Sreedharan
2014-08-18 12:37 ` edubezval
@ 2014-08-18 18:18 ` Jacob Pan
1 sibling, 0 replies; 3+ messages in thread
From: Jacob Pan @ 2014-08-18 18:18 UTC (permalink / raw)
To: Arjun Sreedharan; +Cc: rui.zhang, linux-kernel
On Mon, 18 Aug 2014 15:03:20 +0530
Arjun Sreedharan <arjun024@gmail.com> wrote:
> @number first, @size second argument
>
> Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
> ---
Acked-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Thanks for the fix.
> 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");
[Jacob Pan]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-08-18 18:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-18 9:33 [PATCH] tools/thermal: fix calloc argument ordering Arjun Sreedharan
2014-08-18 12:37 ` edubezval
2014-08-18 18:18 ` Jacob Pan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox