Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 288595
b: refs/heads/master
c: 05d74ef
h: refs/heads/master
i:
  288593: 15ed6a8
  288591: d0cdad6
v: v3
  • Loading branch information
Alexander Gordeev authored and Thomas Gleixner committed Mar 9, 2012
1 parent f78ad94 commit 52e4413
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4bcdf1d0b652bc33d52f2322b77463e4dc58abf8
refs/heads/master: 05d74efa3c72a5c40b0edeb15856c0230126313b
6 changes: 2 additions & 4 deletions trunk/kernel/irq/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -1106,8 +1106,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
struct task_struct *t = new->thread;

new->thread = NULL;
if (likely(!test_bit(IRQTF_DIED, &new->thread_flags)))
kthread_stop(t);
kthread_stop(t);
put_task_struct(t);
}
out_mput:
Expand Down Expand Up @@ -1217,8 +1216,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
#endif

if (action->thread) {
if (!test_bit(IRQTF_DIED, &action->thread_flags))
kthread_stop(action->thread);
kthread_stop(action->thread);
put_task_struct(action->thread);
}

Expand Down

0 comments on commit 52e4413

Please sign in to comment.