From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.99]:38970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727801AbgFRBLO (ORCPT ); Wed, 17 Jun 2020 21:11:14 -0400 From: Sasha Levin Subject: [PATCH AUTOSEL 5.7 142/388] s390/qdio: tear down thinint indicator after early error Date: Wed, 17 Jun 2020 21:03:59 -0400 Message-Id: <20200618010805.600873-142-sashal@kernel.org> In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-s390-owner@vger.kernel.org List-ID: To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Julian Wiedmann , Benjamin Block , Vasily Gorbik , Sasha Levin , linux-s390@vger.kernel.org From: Julian Wiedmann [ Upstream commit 68a381746f20e5435206173e22d0a011ef78790e ] qdio_establish() calls qdio_establish_thinint(), but later has an error exit path that doesn't roll this call back. Fix it. Fixes: 779e6e1c724d ("[S390] qdio: new qdio driver.") Signed-off-by: Julian Wiedmann Reviewed-by: Benjamin Block Signed-off-by: Vasily Gorbik Signed-off-by: Sasha Levin --- drivers/s390/cio/qdio_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c index da5a11138020..80cc811bd2e0 100644 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c @@ -1363,6 +1363,7 @@ int qdio_establish(struct ccw_device *cdev, if (rc) { DBF_ERROR("%4x est IO ERR", irq_ptr->schid.sch_no); DBF_ERROR("rc:%4x", rc); + qdio_shutdown_thinint(irq_ptr); qdio_shutdown_irq(irq_ptr); mutex_unlock(&irq_ptr->setup_mutex); return rc; -- 2.25.1