lkml.org 
[lkml]   [2011]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH resend] s390: oprofile: fix error checks in oprofile_hwsampler_init()
Checking 'oprofile_min_interval < 0' and
'oprofile_max_interval < 0' doesn't work because
'oprofile_min_interval' and 'oprofile_max_interval' are unsigned.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
---
Untested.

arch/s390/oprofile/init.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index c63d7e5..09c3088 100644
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -138,22 +138,26 @@ static int oprofile_create_hwsampling_files(struct super_block *sb,

static int oprofile_hwsampler_init(struct oprofile_operations *ops)
{
+ long retval;
+
if (hwsampler_setup())
return -ENODEV;

/*
* create hwsampler files only if hwsampler_setup() succeeds.
*/
- oprofile_min_interval = hwsampler_query_min_interval();
- if (oprofile_min_interval < 0) {
+ retval = hwsampler_query_min_interval();
+ if (retval < 0) {
oprofile_min_interval = 0;
return -ENODEV;
}
- oprofile_max_interval = hwsampler_query_max_interval();
- if (oprofile_max_interval < 0) {
+ oprofile_min_interval = retval;
+ retval = hwsampler_query_max_interval();
+ if (retval < 0) {
oprofile_max_interval = 0;
return -ENODEV;
}
+ oprofile_max_interval = retval;

if (oprofile_timer_init(ops))
return -ENODEV;
--
1.7.3.4

\
 
 \ /
  Last update: 2011-05-02 15:55    [W:1.089 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site