Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 48611
b: refs/heads/master
c: 5575ddf
h: refs/heads/master
i:
  48609: 3857a9e
  48607: 86e2955
v: v3
  • Loading branch information
Jan Beulich authored and Linus Torvalds committed Feb 16, 2007
1 parent a5f462d commit c14bf72
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: 472900b8b02bf3782b06dcf0acdef26811c2b995
refs/heads/master: 5575ddf75ca7e61d6f69b96368e03dd88edd4604
6 changes: 2 additions & 4 deletions trunk/kernel/irq/chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -565,10 +565,8 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,

/* Uninstall? */
if (handle == handle_bad_irq) {
if (desc->chip != &no_irq_chip) {
desc->chip->mask(irq);
desc->chip->ack(irq);
}
if (desc->chip != &no_irq_chip)
mask_ack_irq(desc, irq);
desc->status |= IRQ_DISABLED;
desc->depth = 1;
}
Expand Down

0 comments on commit c14bf72

Please sign in to comment.