1 files changed, 12 insertions, 13 deletions

diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index 64f886fac2ef..9c075e105d60 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -238,22 +238,21 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
          */
         ret |= !valid_user_regs(regs);
 
+        if (ret != 0) {
+                force_sigsegv(sig, current);
+                return;
+        }
+
         /*
-         * Block the signal if we were unsuccessful.
+         * Block the signal if we were successful.
          */
-        if (ret != 0 || !(ka->sa.sa_flags & SA_NODEFER)) {
-                spin_lock_irq(&current->sighand->siglock);
-                sigorsets(&current->blocked, &current->blocked,
-                          &ka->sa.sa_mask);
+        spin_lock_irq(&current->sighand->siglock);
+        sigorsets(&current->blocked, &current->blocked,
+                  &ka->sa.sa_mask);
+        if (!(ka->sa.sa_flags & SA_NODEFER))
                 sigaddset(&current->blocked, sig);
-                recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
-        }
-
-        if (ret == 0)
-                return;
-
-        force_sigsegv(sig, current);
+        recalc_sigpending();
+        spin_unlock_irq(&current->sighand->siglock);
 }
 
 /*