1 files changed, 6 insertions, 0 deletions

diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 5995e9bc72d9..5e2ab03eaffd 100644
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -151,6 +151,12 @@ static int oprofile_hwsampler_init(struct oprofile_operations *ops)
         if (oprofile_max_interval == 0)
                 return -ENODEV;
 
+        /* The initial value should be sane */
+        if (oprofile_hw_interval < oprofile_min_interval)
+                oprofile_hw_interval = oprofile_min_interval;
+        if (oprofile_hw_interval > oprofile_max_interval)
+                oprofile_hw_interval = oprofile_max_interval;
+
         if (oprofile_timer_init(ops))
                 return -ENODEV;