diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 22:45:50 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 22:45:50 -0500 |
| commit | e8b722f487589a1f60ca27adc695494f188d404e (patch) | |
| tree | be3897dceb9b7c0949a8917ab11eea2752375e3b /drivers/s390/block/dasd_3990_erp.c | |
| parent | 01d07820a0df6b6134c1bb75b1e84c9d0cdab3be (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into irq/urgent
Diffstat (limited to 'drivers/s390/block/dasd_3990_erp.c')
| -rw-r--r-- | drivers/s390/block/dasd_3990_erp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index b8f9c00633f3..d82aad5224f0 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c | |||
| @@ -2621,7 +2621,7 @@ dasd_3990_erp_action(struct dasd_ccw_req * cqr) | |||
| 2621 | } | 2621 | } |
| 2622 | } | 2622 | } |
| 2623 | 2623 | ||
| 2624 | /* double-check if current erp/cqr was successfull */ | 2624 | /* double-check if current erp/cqr was successful */ |
| 2625 | if ((cqr->irb.scsw.cmd.cstat == 0x00) && | 2625 | if ((cqr->irb.scsw.cmd.cstat == 0x00) && |
| 2626 | (cqr->irb.scsw.cmd.dstat == | 2626 | (cqr->irb.scsw.cmd.dstat == |
| 2627 | (DEV_STAT_CHN_END | DEV_STAT_DEV_END))) { | 2627 | (DEV_STAT_CHN_END | DEV_STAT_DEV_END))) { |