diff options
| author | Linus Torvalds | 2010-04-22 08:43:59 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-04-22 08:43:59 -0700 |
| commit | c81eddb0e3728661d1585fbc564449c94165cc36 (patch) | |
| tree | bd7dbc09bec4c1c90552718d48fb7f30b94e0265 /drivers/s390/cio/device_fsm.c | |
| parent | a28ca3f3244dfe05d16c67f2c0636ce6bf2b4e0a (diff) | |
| parent | 76ef964c78797f9baed7c2f9a58f696e86d8a048 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] zcore: Fix reipl device detection
[S390] vdso: use ntp adjusted clock multiplier
[S390] cio: use exception-save stsch
[S390] add hook to reenable mss after hibernation
[S390] cio: allow enable_facility from outside init functions
[S390] dasd: fix endless loop in erp
Diffstat (limited to 'drivers/s390/cio/device_fsm.c')
| -rw-r--r-- | drivers/s390/cio/device_fsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index c56ab94612f9..c9b852647f01 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c @@ -45,7 +45,7 @@ static void ccw_timeout_log(struct ccw_device *cdev) sch = to_subchannel(cdev->dev.parent); private = to_io_private(sch); orb = &private->orb; - cc = stsch(sch->schid, &schib); + cc = stsch_err(sch->schid, &schib); printk(KERN_WARNING "cio: ccw device timeout occurred at %llx, " "device information:\n", get_clock()); |