1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c
index c4acac74725c..f74fc0ca2ef9 100644
--- a/drivers/misc/sgi-gru/grufault.c
+++ b/drivers/misc/sgi-gru/grufault.c
@@ -876,8 +876,9 @@ int gru_set_context_option(unsigned long arg)
         switch (req.op) {
         case sco_blade_chiplet:
                 /* Select blade/chiplet for GRU context */
-                if (req.val1 < -1 || req.val1 >= GRU_MAX_BLADES || !gru_base[req.val1] ||
-                    req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB) {
+                if (req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB ||
+                    req.val1 < -1 || req.val1 >= GRU_MAX_BLADES ||
+                    (req.val1 >= 0 && !gru_base[req.val1])) {
                         ret = -EINVAL;
                 } else {
                         gts->ts_user_blade_id = req.val1;