From: Jan Glauber Date: Tue, 28 Oct 2008 10:10:13 +0000 (+0100) Subject: [S390] qdio: prevent double qdio shutdown in case of I/O errors X-Git-Tag: v2.6.28-rc3~92^2~9 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7c045aa2c8eb731996b0c5c6552356b8946e6894;p=linux-2.6-omap-h63xx.git [S390] qdio: prevent double qdio shutdown in case of I/O errors 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 Signed-off-by: Martin Schwidefsky --- diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c index a50682d2a0f..7c865915199 100644 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c @@ -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);