diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/s390/char | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/s390/char')
| -rw-r--r-- | drivers/s390/char/fs3270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c index 097d3846a828..f54b1eec6ddf 100644 --- a/drivers/s390/char/fs3270.c +++ b/drivers/s390/char/fs3270.c | |||
| @@ -74,7 +74,7 @@ fs3270_do_io(struct raw3270_view *view, struct raw3270_request *rq) | |||
| 74 | } | 74 | } |
| 75 | rc = raw3270_start(view, rq); | 75 | rc = raw3270_start(view, rq); |
| 76 | if (rc == 0) { | 76 | if (rc == 0) { |
| 77 | /* Started sucessfully. Now wait for completion. */ | 77 | /* Started successfully. Now wait for completion. */ |
| 78 | wait_event(fp->wait, raw3270_request_final(rq)); | 78 | wait_event(fp->wait, raw3270_request_final(rq)); |
| 79 | } | 79 | } |
| 80 | } while (rc == -EACCES); | 80 | } while (rc == -EACCES); |