Merge ../linux-2.6

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 1bbf231f8aaf..3c77d65960db 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -409,6 +409,9 @@ __init_channel_subsystem(struct subchannel_id schid, void *data)
                 /* -ENXIO: no more subchannels. */
                 case -ENXIO:
                         return ret;
+                /* -EIO: this subchannel set not supported. */
+                case -EIO:
+                        return ret;
                 default:
                         return 0;
                 }