diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 22:53:05 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 22:53:05 +0400 |
| commit | ea81e2722e55ba0269c92f266763e445dcffb973 (patch) | |
| tree | a582e2dabdf77a895418ad6bfa5deee2a197b499 /drivers/s390/cio/cio.c | |
| parent | 0b1fc335d2f2c1206ac4048e5f6d8971f2aae6be (diff) | |
| parent | b301ea8c81b13123761772f344faf606c76ba174 (diff) | |
| download | linux-ea81e2722e55ba0269c92f266763e445dcffb973.tar.xz | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] cio: allow offline processing for disconnected devices
[S390] cio: handle ssch() return codes correctly.
[S390] cio: Correct cleanup on error.
[S390] CVE-2008-1514: prevent ptrace padding area read/write in 31-bit mode
Diffstat (limited to 'drivers/s390/cio/cio.c')
| -rw-r--r-- | drivers/s390/cio/cio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index 33bff8fec7d1..5954b905e3ca 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c @@ -208,8 +208,10 @@ cio_start_key (struct subchannel *sch, /* subchannel structure */ case 1: /* status pending */ case 2: /* busy */ return -EBUSY; - default: /* device/path not operational */ + case 3: /* device/path not operational */ return cio_start_handle_notoper(sch, lpm); + default: + return ccode; } } |