From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFD4BC433E0 for ; Tue, 23 Jun 2020 21:38:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A638207DD for ; Tue, 23 Jun 2020 21:38:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592948319; bh=ttHX4YYNImlNRhLzLb7gps9c525D8cVu8sy7NvSpbjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K8WE+sTjrOvWICqnclq72pBubaPwHNBecZtAaU/hQHQvOU+Bbs+OUG8xN74GHR//T bveBsvkwfncEu1D4e8xXPJ1ULQSfBNW2lyR13pcH+zDCYRlFbcwUpdFe7taCuG4xBb Iv6POM270uUBQDmHeSnsMb373zlniGHN0uKZVZgY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388693AbgFWUIC (ORCPT ); Tue, 23 Jun 2020 16:08:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:48776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388683AbgFWUH5 (ORCPT ); Tue, 23 Jun 2020 16:07:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C5E09206C3; Tue, 23 Jun 2020 20:07:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942877; bh=ttHX4YYNImlNRhLzLb7gps9c525D8cVu8sy7NvSpbjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cxErd6/DrOdraYmM0M45PdcqtPqymwa+3LzAjkCac9aeUyTFZZKugKzHAayB6C/X7 7zGRrtblPIakzecuN6qbF+Q7J+mfSM4gp7cnKnu/7UUl/fmCJ4HDfJP3fvIZr3NzuP yBpGfqaO6U+ICB2LZ9GsQnemVMHCDt4unwUSIW8g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Julian Wiedmann , Benjamin Block , Vasily Gorbik , Sasha Levin Subject: [PATCH 5.7 139/477] s390/qdio: tear down thinint indicator after early error Date: Tue, 23 Jun 2020 21:52:16 +0200 Message-Id: <20200623195414.178540406@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 da5a111380201..80cc811bd2e0e 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