diff options
| author | Stefan Haberland <stefan.haberland@de.ibm.com> | 2009-06-22 12:08:17 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-06-22 12:08:22 +0200 |
| commit | e6125fba81e362d9b314d10893af1d9dc5658f33 (patch) | |
| tree | 74039b088fc81e72e7976c5fca6ea0174eed9160 /drivers/s390/block/dasd.c | |
| parent | 772f54720ab82a6e88f0a8a84d76e7af15ca1f0c (diff) | |
| download | kernel_samsung_smdk4412-e6125fba81e362d9b314d10893af1d9dc5658f33.zip kernel_samsung_smdk4412-e6125fba81e362d9b314d10893af1d9dc5658f33.tar.gz kernel_samsung_smdk4412-e6125fba81e362d9b314d10893af1d9dc5658f33.tar.bz2 | |
[S390] dasd_pm: fix stop flag handling
The stop flags are handled in the generic restore function so the
stop flag is removed also for FBA and DIAG devices.
Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/block/dasd.c')
| -rw-r--r-- | drivers/s390/block/dasd.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index e5b84db..99e7153 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -2503,15 +2503,25 @@ int dasd_generic_restore_device(struct ccw_device *cdev) if (IS_ERR(device)) return PTR_ERR(device); + /* allow new IO again */ + device->stopped &= ~DASD_STOPPED_PM; + device->stopped &= ~DASD_UNRESUMED_PM; + dasd_schedule_device_bh(device); if (device->block) dasd_schedule_block_bh(device->block); if (device->discipline->restore) rc = device->discipline->restore(device); + if (rc) + /* + * if the resume failed for the DASD we put it in + * an UNRESUMED stop state + */ + device->stopped |= DASD_UNRESUMED_PM; dasd_put_device(device); - return rc; + return 0; } EXPORT_SYMBOL_GPL(dasd_generic_restore_device); |