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:     Heikki Krogerus <heikki.krogerus@linux.intel.com>,
        linux-kernel@vger.kernel.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH v3 2/3] usb: ulpi: Call of_node_put correctly
Date:   Thu, 27 Jan 2022 14:00:03 -0500
Message-Id: <20220127190004.1446909-3-sean.anderson@seco.com>
In-Reply-To: <20220127190004.1446909-1-sean.anderson@seco.com>
References: <20220127190004.1446909-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?AgAyCF+jqee2oduBt9ouMkMDjJ6xJlW/rAsz8rl6+YOA38w7BFVJ3JGkD3X4?=
 =?us-ascii?Q?hS5H0QUfCXXMYr42bfUSWOFzEjf++Id/GYoLuHcwuOLoOeFs72O3guh2ynQW?=
 =?us-ascii?Q?l1K2Z2XcXljb7pKje/sSnsii0dbx8ys1bhUEhfTIL0Speqgclo0P9pz5Iuvp?=
 =?us-ascii?Q?SGE75v9OHGswN35kDGPUVYjJCe1HvB+UggTpSCZ42JNkyzLgRGbSNQ5bTygx?=
 =?us-ascii?Q?Yu2Ob7EFm5rn6AuGM6VoP2XzDSS7YxFa6Eiz7NVD4Rlalx7IsWH9SCy9lAip?=
 =?us-ascii?Q?N49B0TfGVKj2NntnqMe/ozif/UqMrlkjU6grttv8P5BVNHmGszuTUXcMzcZr?=
 =?us-ascii?Q?khQdfgL9PHRoUzurX8EatNTTDlCPswsGLIsPOp/CTw4yMiuUEstyEZ6Wqrel?=
 =?us-ascii?Q?sW1P5BUKdfJb3ubyPwsIHROdOsJ8u7j7Etk0+5eNYq5K5RXOaedN9uy7LqjQ?=
 =?us-ascii?Q?BJ18io55qncHEgroHXbHvE5qUfpv7oy2+8YK4gHx4hENkQYeXibn4K2P0vmT?=
 =?us-ascii?Q?KTHi9TlHZtmwW7QUY1n2VLqzNzJMuEtRl9Jr0e12jDRFzXofT+fhdStEoog+?=
 =?us-ascii?Q?J3qGqXtsq9/JnRQKeUuRwnjVe4zWbFJHPeUb+aas33Ec2jZSn+SCpyM4xUta?=
 =?us-ascii?Q?vDN7QJRUmtZrf96X+tdbDZkVSJYe/QGRl0E5xhiUKNEbxz7dxin8frEuSnT0?=
 =?us-ascii?Q?//XxpxWF2INZ1SNeQPJoYsC9qSYhII/7WK+Dl5u7XrUIqHC/L41vP0x0PQ0b?=
 =?us-ascii?Q?LBxtwRzGo1FoCqygquotws+DP4YmrcRyCQYO8tzXlRBvx1jpEYTCUXTjXr2L?=
 =?us-ascii?Q?0gG+cgzanspUU1wXpL9dvG4Ppx2mEiLRoXl27BCk700LN35PUWUqowN+bGCU?=
 =?us-ascii?Q?us/BNgAmQuw3nzTbMvrP9dMYg/Oc2nnn5dEXUblPnMqznfbz5Vuznbco83IJ?=
 =?us-ascii?Q?ccdzY5FQkoUl2ScsVqnx6ZSMNvhcq8Y2F9e4njGwl+nWruYZ+1HUs2/zL3aU?=
 =?us-ascii?Q?3VIoXF/sB1mshYaUcXC0SFRIiCVaxSdeGG6mMImHchsHANUnBucL/M05M1Zr?=
 =?us-ascii?Q?XqaS+Fz2DlkqVD7zG3EQVT7LZe8uqWyYYQ3Z+e2hVUyPJhap5N3Y1X50AjfZ?=
 =?us-ascii?Q?ikrF94WG2bxF1aN3/i4x5erMnzZeevkC96FuwXJ34YC86hhiyYX+W5u8RpmC?=
 =?us-ascii?Q?kljJaADhzBSKhKudtgInpPrLPx5UI34l4c34aGKgea/HMS1YNSGXXaV6ltlb?=
 =?us-ascii?Q?EN68k3Tv0yhK5JDD//yCdK+x7XihRPCrSoaqgHVYSQr2+1udqiJfjWUoDVYT?=
 =?us-ascii?Q?i1x/hEqU5AXaBKucqaiZdhxHhE/ZLx5f2RL/nzRRpvlFFntWbG7Zp/3yUzju?=
 =?us-ascii?Q?s8jrYMzs6bLYW00z2zodYC1OZ/0NEuekBqtWLG5ofEiwHlMVrRVLxBpM/cH3?=
 =?us-ascii?Q?uTlKRWtmb7KoHtGHfuZic62u40PL0A8aN6YB8b2qE2sW6cBwvPPrBIa57Zxe?=
 =?us-ascii?Q?BYK4jU9Xuv16XeJxDmdp5X+a6zUE4EV1CNFJkyFrUopznPKiiOPYfMD7yQZS?=
 =?us-ascii?Q?hNFVdH24lst2uljJwUEUAAjw4dwhTS8D++idJCK0AJVxgcnzigOwS8e2NnlT?=
 =?us-ascii?Q?1RafD5w+uJRT5EdT+SW04m0=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5180027f-15e5-4e03-6d59-08d9e1c74747
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 19:00:26.2584
 (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: 0UcsDLVyrvpvqdZKuxTEr9Zj7CmxsQC9XxtLLZxihOisSNCd/vhm5q+UOuDGyC6RxSDCtMxreBW0pPG6thUOLw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR2PR03MB5466
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 put_device if
device_register fails, which will call ulpi_dev_release if necessary.

Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

Changes in v3:
- Add Fixes tag
- Call put_device if device_register fails

Changes in v2:
- New

 drivers/usb/common/ulpi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index c90a1ab705a3..dedcb749a02f 100644
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -245,12 +245,16 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi)
 		return ret;
 
 	ret = ulpi_read_id(ulpi);
-	if (ret)
+	if (ret) {
+		of_node_put(ulpi->dev.of_node);
 		return ret;
+	}
 
 	ret = device_register(&ulpi->dev);
-	if (ret)
+	if (ret) {
+		put_device(&ulpi->dev);
 		return ret;
+	}
 
 	dev_dbg(&ulpi->dev, "registered ULPI PHY: vendor %04x, product %04x\n",
 		ulpi->id.vendor, ulpi->id.product);
-- 
2.25.1