Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1758884ybz; Sat, 18 Apr 2020 07:54:46 -0700 (PDT) X-Google-Smtp-Source: APiQypKV+vlGVDO8tTJ4Xi2f0Cd3dm9ttf2bmxWgg3CIRFDsbnFw1eG79vAo0ba8v1XhTUO9Xkcz X-Received: by 2002:a17:906:f288:: with SMTP id gu8mr8292767ejb.281.1587221685955; Sat, 18 Apr 2020 07:54:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221685; cv=none; d=google.com; s=arc-20160816; b=y+X1v2VWr2JdM6aGDkyuc5tmeHpOLLJaqyv1QJRqRN8FzMWZxy5gMfe7M1AlKZvB6B p6ia6BYA3CCEorCVQsRFY6RRrr4kG+N3pw96HecWO9SgyeVnatJ3ohZsjwbbRuGH2/Ja MF4IILjzl9ZOzr9hkZbILRdQKW05FuBiaG75XS8pNIBgHkwjF/An7Ex2So/FIqWcDqZU LsYJZwvKmLmdbvprUDjSW25Ks9EsHcPS1/pSDrg2g18VOrB+sOQAxCB5FpfxWtZ9KRDs D/ZYLgtuxsrAtoo3u1Yq8a+VbCn5gMJAOwhymDebtgDDV1oc1w/SBm1HMH9DQoIIsYpH xWcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NzPbzNJ0bVX+ZXLm+qGO75EBzxxKkYDtgnKJ6oKqB+o=; b=j+8xnfIE7bMl1HvwdMj6aLFfObRR2gkRDMA9Uv5z4m2HWIE5Thy4vhmzG5woCz9NJB TnAQNDmRuSiL7idZoIydhE/uvbLMz266qtrHOE2Mxwu05qIDhCuvS24ozKQFlP4elcBY SicEKDpKVgT8xTNQOu9LWH7OGEANLIhp1jV2XqCXbBYKPltcq2QJLqXVqFXUYK9qT/wz i3ej1SX1BDfIcahyCzYvPiDuFlshty5qGqigS7faBdJEVncLBUrfSFRRyBp3SDW+qliO aVPOHLD2P+1zW9uciAjWQtYp7JmQaj8yY9Abn+OAHJH/oHf/D6egZjC7Ns87AwgoYd8a i7dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZCO5MiC9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z72si17422800ede.95.2020.04.18.07.54.23; Sat, 18 Apr 2020 07:54:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZCO5MiC9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728552AbgDROwS (ORCPT + 99 others); Sat, 18 Apr 2020 10:52:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:52366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728313AbgDROmV (ORCPT ); Sat, 18 Apr 2020 10:42:21 -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 D881522252; Sat, 18 Apr 2020 14:42:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220941; bh=aBiKRtEwJSJ8EawSUmhre+WjRJEOrBukB4zaQ//1MYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZCO5MiC9WXbVcnSkq8yXnLtFflNOWuXow1rAq7lR0jKRSp/hQiIG+1NaFCJORDaKq nR8JxCi9SCDwDSphhg7xxlTUvD54bF3qAAXEle/wYpLWTkwyWzyMYuNTJsgR6pMOcP ggeSh/mEWwfA7LBhrMNzYzhjsyFxtpsUlAb+94CE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Murthy Bhat , Scott Benesh , Scott Teel , Kevin Barnett , Don Brace , "Martin K . Petersen" , Sasha Levin , esc.storagedev@microsemi.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 75/78] scsi: smartpqi: fix call trace in device discovery Date: Sat, 18 Apr 2020 10:40:44 -0400 Message-Id: <20200418144047.9013-75-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144047.9013-1-sashal@kernel.org> References: <20200418144047.9013-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: Murthy Bhat [ Upstream commit b969261134c1b990b96ea98fe5e0fcf8ec937c04 ] Use sas_phy_delete rather than sas_phy_free which, according to comments, should not be called for PHYs that have been set up successfully. Link: https://lore.kernel.org/r/157048748876.11757.17773443136670011786.stgit@brunhilda Reviewed-by: Scott Benesh Reviewed-by: Scott Teel Reviewed-by: Kevin Barnett Signed-off-by: Murthy Bhat Signed-off-by: Don Brace Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/smartpqi/smartpqi_sas_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/smartpqi/smartpqi_sas_transport.c b/drivers/scsi/smartpqi/smartpqi_sas_transport.c index 6776dfc1d317c..b7e28b9f8589f 100644 --- a/drivers/scsi/smartpqi/smartpqi_sas_transport.c +++ b/drivers/scsi/smartpqi/smartpqi_sas_transport.c @@ -45,9 +45,9 @@ static void pqi_free_sas_phy(struct pqi_sas_phy *pqi_sas_phy) struct sas_phy *phy = pqi_sas_phy->phy; sas_port_delete_phy(pqi_sas_phy->parent_port->port, phy); - sas_phy_free(phy); if (pqi_sas_phy->added_to_port) list_del(&pqi_sas_phy->phy_list_entry); + sas_phy_delete(phy); kfree(pqi_sas_phy); } -- 2.20.1