| From a5c7973539b010874a37a0e846e62ac6f00553ba Mon Sep 17 00:00:00 2001 |
| From: Alexey Charkov <alchark@gmail.com> |
| Date: Fri, 25 Apr 2025 18:11:11 +0400 |
| Subject: usb: uhci-platform: Make the clock really optional |
| |
| From: Alexey Charkov <alchark@gmail.com> |
| |
| 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 <stable@kernel.org> |
| Fixes: 26c502701c52 ("usb: uhci: Add clk support to uhci-platform") |
| Signed-off-by: Alexey Charkov <alchark@gmail.com> |
| Link: https://lore.kernel.org/r/20250425-uhci-clock-optional-v1-1-a1d462592f29@gmail.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| 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 |
| @@ -122,7 +122,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; |
