]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
[S390] qdio: prevent double qdio shutdown in case of I/O errors
authorJan Glauber <jang@linux.vnet.ibm.com>
Tue, 28 Oct 2008 10:10:13 +0000 (11:10 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Tue, 28 Oct 2008 10:12:02 +0000 (11:12 +0100)
In case of I/O errors on a qdio subchannel qdio_shutdown may be
called twice by the qdio driver and by zfcp. Remove the
superfluous shutdown from qdio and let the upper layer driver
handle the error condition.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/cio/qdio_main.c

index a50682d2a0fa5ebae84dec275ae634febd52c4b5..7c8659151993d8acfc12d0f02a0b60eb56c91eff 100644 (file)
@@ -1083,7 +1083,6 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
                case -EIO:
                        sprintf(dbf_text, "ierr%4x", irq_ptr->schid.sch_no);
                        QDIO_DBF_TEXT2(1, setup, dbf_text);
-                       qdio_int_error(cdev);
                        return;
                case -ETIMEDOUT:
                        sprintf(dbf_text, "qtoh%4x", irq_ptr->schid.sch_no);