diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /drivers/s390/cio/device_ops.c | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/s390/cio/device_ops.c')
| -rw-r--r-- | drivers/s390/cio/device_ops.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c index a60124264bee..9e3de0bd59b5 100644 --- a/drivers/s390/cio/device_ops.c +++ b/drivers/s390/cio/device_ops.c | |||
| @@ -263,6 +263,9 @@ ccw_device_wake_up(struct ccw_device *cdev, unsigned long ip, struct irb *irb) | |||
| 263 | /* Abuse intparm for error reporting. */ | 263 | /* Abuse intparm for error reporting. */ |
| 264 | if (IS_ERR(irb)) | 264 | if (IS_ERR(irb)) |
| 265 | cdev->private->intparm = -EIO; | 265 | cdev->private->intparm = -EIO; |
| 266 | else if (irb->scsw.cc == 1) | ||
| 267 | /* Retry for deferred condition code. */ | ||
| 268 | cdev->private->intparm = -EAGAIN; | ||
| 266 | else if ((irb->scsw.dstat != | 269 | else if ((irb->scsw.dstat != |
| 267 | (DEV_STAT_CHN_END|DEV_STAT_DEV_END)) || | 270 | (DEV_STAT_CHN_END|DEV_STAT_DEV_END)) || |
| 268 | (irb->scsw.cstat != 0)) { | 271 | (irb->scsw.cstat != 0)) { |