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=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 1616AC43463 for ; Fri, 18 Sep 2020 02:11:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C842F238E6 for ; Fri, 18 Sep 2020 02:11:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600395092; bh=YdXmMUMcrIidM4jJ5bBCr8dU2Vox3/LTnIzsgfEFBrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=w6XVpb/Z0qH7PK84M+OOpmW58XVc1dROkEnYk+/PdDLUZmg4MqOPubLSZYQhATiJB +IxctwyeuPprDau0WfmjZD5jm3ffy42+EFvWZ+fdidqJMdqMpANqAW9LHk98VTIiOA UECQLfydE3cJqvhYPqUz+AjTpnug37JgjFr5Xj6s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728651AbgIRCLb (ORCPT ); Thu, 17 Sep 2020 22:11:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:36852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728642AbgIRCL0 (ORCPT ); Thu, 17 Sep 2020 22:11:26 -0400 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 4A949208DB; Fri, 18 Sep 2020 02:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600395086; bh=YdXmMUMcrIidM4jJ5bBCr8dU2Vox3/LTnIzsgfEFBrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Aa65o8pSdeqww05bSybePijfbgPRsyaboY3sl7nhfLRzqtujQj/Z4gQzcsatm3TEO skMvHaJ7lZAMl5Ay9+GtdIn7fOBxTgnYzXesPR1/goKKpt+ovFgJfP2dTgdJXFQxLC 2Uvv85L8DKU45WK4Zt5SElQvgXq32wJupugi9isM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wei Yongjun , "Matthew R . Ochs" , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 168/206] scsi: cxlflash: Fix error return code in cxlflash_probe() Date: Thu, 17 Sep 2020 22:07:24 -0400 Message-Id: <20200918020802.2065198-168-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918020802.2065198-1-sashal@kernel.org> References: <20200918020802.2065198-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Wei Yongjun [ Upstream commit d0b1e4a638d670a09f42017a3e567dc846931ba8 ] Fix to return negative error code -ENOMEM from create_afu error handling case instead of 0, as done elsewhere in this function. Link: https://lore.kernel.org/r/20200428141855.88704-1-weiyongjun1@huawei.com Acked-by: Matthew R. Ochs Signed-off-by: Wei Yongjun Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/cxlflash/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c index f987c40c47a13..443813feaef47 100644 --- a/drivers/scsi/cxlflash/main.c +++ b/drivers/scsi/cxlflash/main.c @@ -3749,6 +3749,7 @@ static int cxlflash_probe(struct pci_dev *pdev, cfg->afu_cookie = cfg->ops->create_afu(pdev); if (unlikely(!cfg->afu_cookie)) { dev_err(dev, "%s: create_afu failed\n", __func__); + rc = -ENOMEM; goto out_remove; } -- 2.25.1