diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
| commit | 83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18 (patch) | |
| tree | 5ba3bbbe977c2047658b41e22d6b2abd5686bf15 /drivers/s390/cio/device_ops.c | |
| parent | 8638460540749ddb1beca9e9a68d655a6fe6df65 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'master' into gfs2
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)) { |