diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-13 05:12:09 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-13 05:12:09 (GMT) |
| commit | f1b318793dcd2d9ff6b5ac06e7762098fa079cee (patch) | |
| tree | 41ace7a3e453b82776b9f2a1d3b670b6afe5aa59 /drivers/s390/cio | |
| parent | 49430f97dd952eda60848bf6bf161b4917ba103d (diff) | |
| parent | e9bb4c9929a63b23dcc637fae312b36b038bdc61 (diff) | |
| download | linux-fsl-qoriq-f1b318793dcd2d9ff6b5ac06e7762098fa079cee.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'drivers/s390/cio')
| -rw-r--r-- | drivers/s390/cio/chsc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c index 92be75d..8cf9905 100644 --- a/drivers/s390/cio/chsc.c +++ b/drivers/s390/cio/chsc.c @@ -232,7 +232,7 @@ s390_subchannel_remove_chpid(struct device *dev, void *data) return 0; mask = 0x80 >> j; - spin_lock(&sch->lock); + spin_lock_irq(&sch->lock); stsch(sch->schid, &schib); if (!schib.pmcw.dnv) @@ -281,10 +281,10 @@ s390_subchannel_remove_chpid(struct device *dev, void *data) if (sch->driver && sch->driver->verify) sch->driver->verify(&sch->dev); out_unlock: - spin_unlock(&sch->lock); + spin_unlock_irq(&sch->lock); return 0; out_unreg: - spin_unlock(&sch->lock); + spin_unlock_irq(&sch->lock); sch->lpm = 0; if (css_enqueue_subchannel_slow(sch->schid)) { css_clear_subchannel_slow_list(); @@ -652,7 +652,7 @@ __chp_add(struct subchannel_id schid, void *data) if (!sch) /* Check if the subchannel is now available. */ return __chp_add_new_sch(schid); - spin_lock(&sch->lock); + spin_lock_irq(&sch->lock); for (i=0; i<8; i++) if (sch->schib.pmcw.chpid[i] == chp->id) { if (stsch(sch->schid, &sch->schib) != 0) { @@ -674,7 +674,7 @@ __chp_add(struct subchannel_id schid, void *data) if (sch->driver && sch->driver->verify) sch->driver->verify(&sch->dev); - spin_unlock(&sch->lock); + spin_unlock_irq(&sch->lock); put_device(&sch->dev); return 0; } |