oprofile: oprofile_set_timeout(), return with error for invalid args

Return with -EINVAL for invalid parameters instead of setting the
default value in oprofile_set_timeout().

Signed-off-by: Robert Richter <robert.richter@amd.com>

diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index 7bc64af..42c9c76 100644 (file)
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -196,6 +196,7 @@ post_sync:
 int oprofile_set_timeout(unsigned long val_msec)
 {
        int err = 0;
 int oprofile_set_timeout(unsigned long val_msec)
 {
        int err = 0;

+       unsigned long time_slice;

 
        mutex_lock(&start_mutex);
 
 
        mutex_lock(&start_mutex);
 


@@ -209,9 +210,13 @@ int oprofile_set_timeout(unsigned long val_msec)
                goto out;
        }
 
                goto out;
        }
 

-       timeout_jiffies = msecs_to_jiffies(val_msec);
-       if (timeout_jiffies == MAX_JIFFY_OFFSET)
-               timeout_jiffies = msecs_to_jiffies(MULTIPLEXING_TIMER_DEFAULT);
+       time_slice = msecs_to_jiffies(val_msec);
+       if (time_slice == MAX_JIFFY_OFFSET) {
+               err = -EINVAL;
+               goto out;
+       }
+
+       timeout_jiffies = time_slice;

 
 out:
        mutex_unlock(&start_mutex);
 
 out:
        mutex_unlock(&start_mutex);