Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1758102ybz; Sat, 18 Apr 2020 07:53:41 -0700 (PDT) X-Google-Smtp-Source: APiQypIGNSdiQ3tzI6UE+DnHHCkiExxdqpRMUOYy+fWVCabjwtvF1WQvR5z31oMacq5roYPdYL08 X-Received: by 2002:a17:906:d143:: with SMTP id br3mr8264522ejb.348.1587221621532; Sat, 18 Apr 2020 07:53:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221621; cv=none; d=google.com; s=arc-20160816; b=k2zIIcYdYtLBB4DUt2Vdea1wU4X91l7sBl/viuMHPNOgMi2loVfJp2tn0o5xV3UXNc rmcOW1cynsyu8k2l5eGQQwbCXfhAGKydVSc2mlkLZbmn6a90qAvZqCrWJhVPLoZ5UrBk yDaLq0BhGzQAJsTeYocWrkgp6zYqQ2vJPuFVtD1kj2Yw7FJnbSDrv6scZ3BdeQBYLkdQ 80nt8DK3MQcnUN2saVC2Q/7YQbeBwjzGiU1HtHtQXzWkR9ERhSjXtC8x8s4Qa59vYHU2 fKmOAMejqvtufzgmxcPSY80M3uyWQimz2SwSAwSx6QNeBxZNRsc9dci5bVtRkHlcR6cx V2Bg== 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=m3HrHWLpdbNdRTD+DHxxyBlpB6Fn7moxrZNhbqkK5tA=; b=IZrL9DRYjhlYE1fy/jzGfLcJhyB5G5ysC9IhHymoXESekjTSsvt13tQp1XD+Sqm946 qEGq16n/FrFn5NsIhJc1mdT7H2nRGHSUDRKtbd++lQ/qWRWrUNQqXi4okYcFpJTFOLip Mx0QwZBBozxx61coaaVOgozCd3Tk9xUtJm+Myky0F0d8+lIQzPUWFYEhEu0lFxXi5li1 Ggf01ZAOiaAVrLz7S2vFNLY6YFL6WQtHOt9GC+2xC56JQMd0MekLGRNh6uBFmEG+IbHr UCgB7oUOqEAWc0jfyYqsUbvpVsO36mrETvxoEvZ5J3/71zBW/u0bu7JKRiTBOFPGxXxS G3lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1eXVAXJr; 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 bm22si891926edb.522.2020.04.18.07.53.18; Sat, 18 Apr 2020 07:53:41 -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=1eXVAXJr; 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 S1728617AbgDROnh (ORCPT + 99 others); Sat, 18 Apr 2020 10:43:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:54470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728575AbgDROn0 (ORCPT ); Sat, 18 Apr 2020 10:43: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 6B41421D82; Sat, 18 Apr 2020 14:43:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587221005; bh=vU+2AAZL6lc+EETr5u0F7lT9UJ/xX/iksxwZJPHuOmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1eXVAXJrWGLmu4c2WjBk2sEnnq14va3olocuKk2c49kLDWaids4qGXafi27piWGho TDroH9O6uvC3MCmg0WNQxZHMVZMLUT8ThkaCEWzh3e31zNKUhMRIehG9Icw9ywNw7W RdMrKWgyKOzqtTgJa0MLzfbB/cGldpWU8h1anREs= 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 4.19 46/47] scsi: smartpqi: fix call trace in device discovery Date: Sat, 18 Apr 2020 10:42:26 -0400 Message-Id: <20200418144227.9802-46-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144227.9802-1-sashal@kernel.org> References: <20200418144227.9802-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 b209a35e482ef..01dfb97b07786 100644 --- a/drivers/scsi/smartpqi/smartpqi_sas_transport.c +++ b/drivers/scsi/smartpqi/smartpqi_sas_transport.c @@ -50,9 +50,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