summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2006-02-17 13:52:45 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-17 13:59:26 -0800
commit6d751c43b29deb1d990fb9644c13ca941c9d1305 (patch)
tree35b8e6346adf177e88419ddbbf743f29021d1ee5
parent4bbf39c29bc3409d6454faf0dfa1b3b0aa2ac2af (diff)
downloadop-kernel-dev-6d751c43b29deb1d990fb9644c13ca941c9d1305.zip
op-kernel-dev-6d751c43b29deb1d990fb9644c13ca941c9d1305.tar.gz
[PATCH] s390: ccw device disbanding
If __ccw_device_disband_start() fails to initiate disbanding, it should finish with ccw_device_disband_done() (which leaves the device in offline state) instead of ccw_device_verify_done() (which leaves the device in online state). Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/s390/cio/device_pgid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index d2a5b04..85b1020 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -405,7 +405,7 @@ __ccw_device_disband_start(struct ccw_device *cdev)
cdev->private->iretry = 5;
cdev->private->imask >>= 1;
}
- ccw_device_verify_done(cdev, (sch->lpm != 0) ? 0 : -ENODEV);
+ ccw_device_disband_done(cdev, (sch->lpm != 0) ? 0 : -ENODEV);
}
/*
OpenPOWER on IntegriCloud