No-op useless unlock calls.

2 files changed, 5 insertions, 7 deletions

diff --git a/litmus/nvidia_info.c b/litmus/nvidia_info.c
index 889313c854e6..3d8c50882066 100644
--- a/litmus/nvidia_info.c
+++ b/litmus/nvidia_info.c
@@ -482,7 +482,9 @@ static int __clear_reg_nv_device(int de_reg_device_id, struct task_struct *t)
     struct task_struct* klitirqd_th = get_klitirqd(de_reg_device_id);
 #endif
 
-        WARN_ON(!test_bit(de_reg_device_id, &tsk_rt(t)->held_gpus));
+        if(!test_bit(de_reg_device_id, &tsk_rt(t)->held_gpus)) {
+                return ret;
+        }
 
         raw_spin_lock_irqsave(&reg->lock, flags);
 
diff --git a/litmus/rsm_lock.c b/litmus/rsm_lock.c
index 6a4bb500c4ae..965164c43537 100644
--- a/litmus/rsm_lock.c
+++ b/litmus/rsm_lock.c
@@ -338,17 +338,13 @@ int rsm_mutex_unlock(struct litmus_lock* l)
 
         int err = 0;
 
-        lock_global_irqsave(dgl_lock, flags);
-        lock_fine_irqsave(&mutex->lock, flags);
-
-
         if (mutex->owner != t) {
                 err = -EINVAL;
-                unlock_fine_irqrestore(&mutex->lock, flags);
-                unlock_global_irqrestore(dgl_lock, flags);
                 return err;
         }
 
+        lock_global_irqsave(dgl_lock, flags);
+        lock_fine_irqsave(&mutex->lock, flags);
 
         raw_spin_lock(&tsk_rt(t)->hp_blocked_tasks_lock);