From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 005AD29AB06; Mon, 12 May 2025 18:11:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747073473; cv=none; b=GrA7FFWF+ItBcKKFpbEx+dOHcuBthGqoVLLwHtj18rJg5nkGpLgddaRasYshRbNjFYMjXJK3NeURkicTLwS6kePIuhQz1UWGBXY88o2M6WOr51HQtPrAN02R28uSd/Tr+Mfxbuua3SqzWe4EAbg6aXLr6qxYd5LwWZm3+KyJfjk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747073473; c=relaxed/simple; bh=W4zOJXvFvXglIyVbAgHLBghP2xACruySjdrfrgTRq5I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kQwRXUpo4KpcxUGE7NTVZ8SibSbmDpQyL48gNLasUB5Wdyp/ieyQamb5iE6yC54h4O3C5gLfZFWzGZwzZIN7EmOmOoZ7QPhLg2avQX/QB6vgZy3xXxZiZ5pTIwX+CYzOXZf9pR+yFTNo/mgMS0Iy4F2xyhBquDwbdrxbOgguPMk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Sgg7azbA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Sgg7azbA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 796F1C4CEE7; Mon, 12 May 2025 18:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747073472; bh=W4zOJXvFvXglIyVbAgHLBghP2xACruySjdrfrgTRq5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sgg7azbA7WbdqLoXZBufxG2EFAuzwAXWEByQLtOI2lP9OMUK40ZQDWJMiwSq4nrw+ KBrOi/LJ8OS1XocYr+Utcm9eWnzLtJwp5spuxa2LQdqgc81ltw8HalpFj7bloMMEhJ pczgt1ZnKtnL5Yz5eL/8kX1YJj4dxT8BBw1PVHJo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Alexey Charkov Subject: [PATCH 6.6 057/113] usb: uhci-platform: Make the clock really optional Date: Mon, 12 May 2025 19:45:46 +0200 Message-ID: <20250512172029.986287263@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250512172027.691520737@linuxfoundation.org> References: <20250512172027.691520737@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexey Charkov commit a5c7973539b010874a37a0e846e62ac6f00553ba upstream. Device tree bindings state that the clock is optional for UHCI platform controllers, and some existing device trees don't provide those - such as those for VIA/WonderMedia devices. The driver however fails to probe now if no clock is provided, because devm_clk_get returns an error pointer in such case. Switch to devm_clk_get_optional instead, so that it could probe again on those platforms where no clocks are given. Cc: stable Fixes: 26c502701c52 ("usb: uhci: Add clk support to uhci-platform") Signed-off-by: Alexey Charkov Link: https://lore.kernel.org/r/20250425-uhci-clock-optional-v1-1-a1d462592f29@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/uhci-platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/host/uhci-platform.c +++ b/drivers/usb/host/uhci-platform.c @@ -121,7 +121,7 @@ static int uhci_hcd_platform_probe(struc } /* Get and enable clock if any specified */ - uhci->clk = devm_clk_get(&pdev->dev, NULL); + uhci->clk = devm_clk_get_optional(&pdev->dev, NULL); if (IS_ERR(uhci->clk)) { ret = PTR_ERR(uhci->clk); goto err_rmr;