diff options
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | 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 6b1caea622ea..25d99bd28089 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) | |||
| 263 | cdev_irb->scsw.cpa = irb->scsw.cpa; | 263 | cdev_irb->scsw.cpa = irb->scsw.cpa; |
| 264 | /* Accumulate device status, but not the device busy flag. */ | 264 | /* Accumulate device status, but not the device busy flag. */ |
| 265 | cdev_irb->scsw.dstat &= ~DEV_STAT_BUSY; | 265 | cdev_irb->scsw.dstat &= ~DEV_STAT_BUSY; |
| 266 | cdev_irb->scsw.dstat |= irb->scsw.dstat; | 266 | /* dstat is not always valid. */ |
| 267 | if (irb->scsw.stctl & | ||
| 268 | (SCSW_STCTL_PRIM_STATUS | SCSW_STCTL_SEC_STATUS | ||
| 269 | | SCSW_STCTL_INTER_STATUS | SCSW_STCTL_ALERT_STATUS)) | ||
| 270 | cdev_irb->scsw.dstat |= irb->scsw.dstat; | ||
| 267 | /* Accumulate subchannel status. */ | 271 | /* Accumulate subchannel status. */ |
| 268 | cdev_irb->scsw.cstat |= irb->scsw.cstat; | 272 | cdev_irb->scsw.cstat |= irb->scsw.cstat; |
| 269 | /* Copy residual count if it is valid. */ | 273 | /* Copy residual count if it is valid. */ |