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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 9DF36C282DD for ; Fri, 10 Jan 2020 22:08:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 654C920678 for ; Fri, 10 Jan 2020 22:08:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578694116; bh=9u/22Bx1CrQ7UmrvZK+V+GRgpaK/YkuZkq0sbndgZKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wuNcDiUZKjbepzUYZEI8c+9KYQNjVb/RquZRgx/+Jr9cMoS/v7Sgbpny0vDwz/zun 7TZASTqbkIkcbAuyIf954VawMbc8f5GhXcf0lvPAYNb4va4+ZR9TmshqTko2B4MOna qpt2VfuDyiqLwYDXHEHVc57j0YuTUY4DLvWaFR9s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727948AbgAJWIf (ORCPT ); Fri, 10 Jan 2020 17:08:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:51214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727526AbgAJWFd (ORCPT ); Fri, 10 Jan 2020 17:05:33 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E5ED220838; Fri, 10 Jan 2020 22:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578693932; bh=9u/22Bx1CrQ7UmrvZK+V+GRgpaK/YkuZkq0sbndgZKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ncf+xUyYZ4icgqCMrAsC5mJ7mOqC1/n4J3fuqHFvip/qNOSWpcgxjIqS3F9NK+vTi +vo6sEOCwangQkm+Ajz8hwOPM2iQqeG41gxPtr+fFqlUAq/pke/CednBph1s1KLAdl ziy5gUxXnMcPXCB3HWp18pnHDjmQsl9ZfKXY4mAw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Julian Wiedmann , "David S . Miller" , Sasha Levin , linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 15/26] s390/qeth: fix initialization on old HW Date: Fri, 10 Jan 2020 17:05:08 -0500 Message-Id: <20200110220519.28250-10-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200110220519.28250-1-sashal@kernel.org> References: <20200110220519.28250-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 0b698c838e84149b690c7e979f78cccb6f8aa4b9 ] I stumbled over an old OSA model that claims to support DIAG_ASSIST, but then rejects the cmd to query its DIAG capabilities. In the old code this was ok, as the returned raw error code was > 0. Now that we translate the raw codes to errnos, the "rc < 0" causes us to fail the initialization of the device. The fix is trivial: don't bail out when the DIAG query fails. Such an error is not critical, we can still use the device (with a slightly reduced set of features). Fixes: 742d4d40831d ("s390/qeth: convert remaining legacy cmd callbacks") Signed-off-by: Julian Wiedmann Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/s390/net/qeth_core_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 7320a187d66a..b60e6b3046ef 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -4963,10 +4963,8 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok) } if (qeth_adp_supported(card, IPA_SETADP_SET_DIAG_ASSIST)) { rc = qeth_query_setdiagass(card); - if (rc < 0) { + if (rc) QETH_CARD_TEXT_(card, 2, "8err%d", rc); - goto out; - } } return 0; out: -- 2.20.1