Changes in / [b40ea02:087768f] in mainline

File:

• kernel/generic/src/ipc/irq.c (modified) (4 diffs)

kernel/generic/src/ipc/irq.c

@@ -358 +358 @@
         ASSERT(irq->notif_cfg.answerbox == box);
         
+        /* Free up the pseudo code and associated structures. */
+        code_free(irq->notif_cfg.code);
+        
         /* Remove the IRQ from the answerbox's list. */
         list_remove(&irq->notif_cfg.link);
@@ -375 +378 @@
         irq_spinlock_unlock(&box->irq_lock, false);
         irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
-        
-        /* Free up the pseudo code and associated structures. */
-        code_free(irq->notif_cfg.code);
         
         /* Free up the IRQ structure. */
@@ -425 +425 @@
                 list_remove(&irq->notif_cfg.link);
                 
+                /* Free up the pseudo code and associated structures. */
+                code_free(irq->notif_cfg.code);
+                
                 /*
                  * We need to drop the IRQ lock now because hash_table_remove()
@@ -436 +439 @@
                 /* Remove from the hash table. */
                 hash_table_remove(&irq_uspace_hash_table, key, 2);
-
-                /*
-                 * Release both locks so that we can free the pseudo code.
-                 */
-                irq_spinlock_unlock(&box->irq_lock, false);
-                irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
-
-                code_free(irq->notif_cfg.code);
+                
                 free(irq);
-                
-                /* Reacquire both locks before taking another round. */
-                irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
-                irq_spinlock_lock(&box->irq_lock, false);
         }