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;
From:   Sean Anderson <sean.anderson@seco.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-usb@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org,
        Heikki Krogerus <heikki.krogerus@linux.intel.com>,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH v2 2/2] usb: ulpi: Call of_node_put correctly
Date:   Mon, 24 Jan 2022 12:33:44 -0500
Message-Id: <20220124173344.874885-2-sean.anderson@seco.com>
In-Reply-To: <20220124173344.874885-1-sean.anderson@seco.com>
References: <20220124173344.874885-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eTrt8PP7J1Sit7VQWnObrn5AbR/jy6xVwwe0PM2X+aA8mFwYYTdIkV7BPAvb?=
 =?us-ascii?Q?UYVazqwN21pr7v6WucGVHfz3WdiVdpVzxt9GbayzXeRp2BRKRxlNmgZ+agVV?=
 =?us-ascii?Q?mCpbTDl6Qr3syZqcjJov4GnFDbUGTFZbOZOrBwxwpVu9EYPOd915t4wN1YwE?=
 =?us-ascii?Q?AJrnErHGpFShjd+yPp7mM79aYNLGdq1qame20NNXD+sBAnvv5XZ79nLu8U6D?=
 =?us-ascii?Q?IQCWqQA1j3D8GJpwUumDXKKVjtR+gFziSHDzYWDjWldO8oXXHpzTg8T3iFlw?=
 =?us-ascii?Q?sgnmbky6s8ZgysBTTy4mczpu6Jg407vP8cGsi0ga/VCJpF54Z6pPOf+DXUb0?=
 =?us-ascii?Q?dfYuBXiGz66qnYbLC5/wh2+jl8ZBK8h5qQsiS7VvAejuQEXsJcfPeIeOgepY?=
 =?us-ascii?Q?UVpnvlg0Ekc6vzbD81pElVkCtbno/aB1kbTSqpmxtXQ/Px0i982zcV33tWDF?=
 =?us-ascii?Q?6Qbgq2gYoJ2zhSWn69RRyRv5F401NzAXggAPblq58Wy9VSJb5cSoPoG+6wQy?=
 =?us-ascii?Q?SThuc5vlMNpzBReKtN2z7Ztmeac0jLQVu9EHVgwutEctmplsxHHnBWS5h8lm?=
 =?us-ascii?Q?fFjizERYleNl4KiN0y0yfuw5b+CA+Ovm+tNqDDKc8gjK8lGIkwQu8mUb0NyY?=
 =?us-ascii?Q?uSXo2a8m2MfRU7tOo1j4yuer19kFNE3jrJ6rpBW7JjnQ/+i5Db23QVwu+dPz?=
 =?us-ascii?Q?OuXO/WOyjntBqygsZ9fgZc80WI7bUwZgeybcK7FBXnkUxh4Q70oLZWa5KAOh?=
 =?us-ascii?Q?6KqfNktnWKil//1BgfFCLMXm8SboHvxLdBVm/RUvGBRS/BdqxwioMPBDFibN?=
 =?us-ascii?Q?cWIqH7ufWo9tYKL9+Iw9zAiVRR3DdbXUomHOEhSw3DnP+xovlVIywD43QkgL?=
 =?us-ascii?Q?4kSP8NZ77cG0roYhHF14Y4XIn7CMrWoKZrI/sd0mhzI9SRV+lHxjIevtt40J?=
 =?us-ascii?Q?4DMSycXWrxwTnZlVfBlnLO3JWUQ0Ct3rVLyVaf9NcFTrdNv3F6QYpA5z8B8O?=
 =?us-ascii?Q?gUUh8F268CZ2nXhkZgOOKjCYXrTXi/pNQCggwF2ETFdfU+rzzSqGPVo0Ooln?=
 =?us-ascii?Q?7gV16nBOPDxX0qR0xSANVpguMV88MCRnvNsuUj0uVwZtSNr38LBTl5eFLtHG?=
 =?us-ascii?Q?UCnls4PBl3bxPHSPaAeDXfVDMrBSHIRDBkED5/8drJsPD4XoBIUF08NlCV7u?=
 =?us-ascii?Q?VLN061gZU8+CuwbyBmFeTjYGNqc4VomKZ21e4W4gBJhwS7pAkwp0YIEfFdw9?=
 =?us-ascii?Q?QKhB7nByBCs7Uenhn9QKJGr238ZkjE6KARzNlS+CibrDxq9ZpwzYeHbL8z0B?=
 =?us-ascii?Q?PXnpPT293+mMIk7iGipvzH7gJ6T35UIT+gqCu7Que9Y2WHVKWh3SgAJ5eaBl?=
 =?us-ascii?Q?oHu6CxTabG4xZ8Quu8uGFtp4R2jXa7GwGLCq/GXTD0TOkwiezeY9esyxvvzB?=
 =?us-ascii?Q?pC0K0zL9L+JQ1eAjbfyxKOsgolfDmqm+ghUrUPmCyiVH6REy6ouJ7uT9LzRz?=
 =?us-ascii?Q?OHY078hcvat2ppgg8p5R8QlN2JSkr0Cy0SNnMeAVTm+W2dTcfu0RqQhOBjU0?=
 =?us-ascii?Q?AEKZDqkHNnIkWm5AFolYD0tpDxO28ErqC1KNlAG488myjRtFDIivfK3MBOoZ?=
 =?us-ascii?Q?y4t7ntG01NZUA9ZWDTtTHjo=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c8f439da-a875-49d4-2901-08d9df5fcb74
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 17:34:37.9316
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Rwgq2xag6tRR8oSdKayHjDmzXavRBzrWzKKHf+TobZSBy3ESsb4rY6YlJPCnwaWCywLRmM6qRgKah3L0psJntA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0302MB3355
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

of_node_put should always be called on device nodes gotten from
of_get_*. Additionally, it should only be called after there are no
remaining users. To address the first issue, call of_node_put if later
steps in ulpi_register fail. To address the latter, call of_node_put
only after calling device_unregister.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

Changes in v2:
- New

 drivers/usb/common/ulpi.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index 87deb514eb78..c6ba72544f2b 100644
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -301,11 +301,11 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi)
 
 	ret = ulpi_read_id(ulpi);
 	if (ret)
-		return ret;
+		goto err;
 
 	ret = device_register(&ulpi->dev);
 	if (ret)
-		return ret;
+		goto err;
 
 	root = debugfs_create_dir(dev_name(dev), ULPI_ROOT);
 	debugfs_create_file("regs", 0444, root, ulpi, &ulpi_regs_ops);
@@ -314,6 +314,10 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi)
 		ulpi->id.vendor, ulpi->id.product);
 
 	return 0;
+
+err:
+	of_node_put(ulpi->dev.of_node);
+	return ret;
 }
 
 /**
@@ -357,8 +361,8 @@ void ulpi_unregister_interface(struct ulpi *ulpi)
 {
 	debugfs_remove_recursive(debugfs_lookup(dev_name(&ulpi->dev),
 						ULPI_ROOT));
-	of_node_put(ulpi->dev.of_node);
 	device_unregister(&ulpi->dev);
+	of_node_put(ulpi->dev.of_node);
 }
 EXPORT_SYMBOL_GPL(ulpi_unregister_interface);
 
-- 
2.25.1