Skip to content

Commit

Permalink
[PATCH] s390: enable interrupts on error path
Browse files Browse the repository at this point in the history
Interrupts can stay disabled if an error occurred in _chp_add().  Use
spin_unlock_irq on the error paths to reenable interrupts.

Signed-off-by: Stefan Bader <shbader@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Stefan Bader authored and Linus Torvalds committed Apr 28, 2006
1 parent 329b785 commit 6dcfca7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/s390/cio/chsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -635,13 +635,13 @@ __chp_add(struct subchannel_id schid, void *data)
if (sch->schib.pmcw.chpid[i] == chp->id) {
if (stsch(sch->schid, &sch->schib) != 0) {
/* Endgame. */
spin_unlock(&sch->lock);
spin_unlock_irq(&sch->lock);
return -ENXIO;
}
break;
}
if (i==8) {
spin_unlock(&sch->lock);
spin_unlock_irq(&sch->lock);
return 0;
}
sch->lpm = ((sch->schib.pmcw.pim &
Expand Down

0 comments on commit 6dcfca7

Please sign in to comment.