tools/thermal: fix calloc argument ordering
PATCH 1/1 tools/thermal: fix calloc argument ordering
@number first, @size second argument
Signed-off-by Arjun Sreedharan <[email protected]>
--- tools/thermal/tmon/sysfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/thermal/tmon/sysfs.c +3 -3
@@ -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" );
Signature · 1 line
1.8.1.msysgit.1
Hello,
Quoted 3 lines · Arjun Sreedharan
@number first, @size second argument
Signed-off-by Arjun Sreedharan <[email protected]>
Acked-by Eduardo Valentin <[email protected]>
Quoted 36 lines
--- tools/thermal/tmon/sysfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)tools/thermal/tmon/sysfs.c +3
-4@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 1 line
Eduardo Bezerra Valentin
Quoted 4 lines · On Mon, 18 Aug 2014 15:03:20 +0530 Arjun Sreedharan <[email protected]> wrote:
@number first, @size second argument
Signed-off-by Arjun Sreedharan <[email protected]>---
Acked-by Jacob Pan <[email protected]>
Thanks for the fix.
Quoted 18 lines
tools/thermal/tmon/sysfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)tools/thermal/tmon/sysfs.c +1
-1@@ -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" );tools/thermal/tmon/sysfs.c +0
-0return -1 ;
tools/thermal/tmon/sysfs.c int probe_thermal_sysfs(void) · line 461
Quoted 10 lines
tools/thermal/tmon/sysfs.c +2
-2@@ -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]