diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-03-08 10:48:37 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-03-08 10:48:40 +0300 |
| commit | c4c3fba61580d267568c5c9cf10c928a41ba38a4 (patch) | |
| tree | 96e9f51838e6b792a9d099c7580faeb51eb7d5bd /drivers/soc | |
| parent | de0980ea2d5360bd1d7472e62231a03c108f20c2 (diff) | |
| parent | 8993e6067f263765fd26edabf3e3012e3ec4d81e (diff) | |
| download | linux-c4c3fba61580d267568c5c9cf10c928a41ba38a4.tar.xz | |
Merge tag 'v5.15.26' into dev-5.15
This is the 5.15.26 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/aspeed/aspeed-lpc-ctrl.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c index 72771e018c42..258894ed234b 100644 --- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c +++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c @@ -306,10 +306,9 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev) } lpc_ctrl->clk = devm_clk_get(dev, NULL); - if (IS_ERR(lpc_ctrl->clk)) { - dev_err(dev, "couldn't get clock\n"); - return PTR_ERR(lpc_ctrl->clk); - } + if (IS_ERR(lpc_ctrl->clk)) + return dev_err_probe(dev, PTR_ERR(lpc_ctrl->clk), + "couldn't get clock\n"); rc = clk_prepare_enable(lpc_ctrl->clk); if (rc) { dev_err(dev, "couldn't enable clock\n"); |