Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=25c61a1fe8c97d1352a2dc0eda25128b3be0db27 Commit: 25c61a1fe8c97d1352a2dc0eda25128b3be0db27 Parent: b70842df77615309d76bcdd63bd289993e0844f2 Author: Cornelia Huck <[EMAIL PROTECTED]> AuthorDate: Mon Mar 26 20:42:41 2007 +0200 Committer: Heiko Carstens <[EMAIL PROTECTED]> CommitDate: Mon Mar 26 20:43:47 2007 +0200
[S390] cio: Device status validity. Only accumulate device status field in irb if it is valid. Cc: Martin Schwidefsky <[EMAIL PROTECTED]> Signed-off-by: Cornelia Huck <[EMAIL PROTECTED]> Signed-off-by: Heiko Carstens <[EMAIL PROTECTED]> --- drivers/s390/cio/device_status.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c index 6b1caea..25d99bd 100644 --- a/drivers/s390/cio/device_status.c +++ b/drivers/s390/cio/device_status.c @@ -263,7 +263,11 @@ ccw_device_accumulate_irb(struct ccw_device *cdev, struct irb *irb) cdev_irb->scsw.cpa = irb->scsw.cpa; /* Accumulate device status, but not the device busy flag. */ cdev_irb->scsw.dstat &= ~DEV_STAT_BUSY; - cdev_irb->scsw.dstat |= irb->scsw.dstat; + /* dstat is not always valid. */ + if (irb->scsw.stctl & + (SCSW_STCTL_PRIM_STATUS | SCSW_STCTL_SEC_STATUS + | SCSW_STCTL_INTER_STATUS | SCSW_STCTL_ALERT_STATUS)) + cdev_irb->scsw.dstat |= irb->scsw.dstat; /* Accumulate subchannel status. */ cdev_irb->scsw.cstat |= irb->scsw.cstat; /* Copy residual count if it is valid. */ - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html