diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-06-16 20:13:52 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-06-16 20:13:52 -0700 |
commit | 9cbc9911260f24cd3ce2bfb3bcdf4792366a5745 (patch) | |
tree | 4600a657ac1e8977ff706bf398eb27de2dedab7f /drivers/gpio/gpio-dwapb.c | |
parent | 5dcb50c009c9f8ec1cfca6a81a05c0060a5bbf68 (diff) | |
parent | 48a23ec6ff2b2a5effe8d3ae5f17fc6b7f35df65 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/gpio/gpio-dwapb.c')
-rw-r--r-- | drivers/gpio/gpio-dwapb.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c index 04afe728e187..c22fcaa44a61 100644 --- a/drivers/gpio/gpio-dwapb.c +++ b/drivers/gpio/gpio-dwapb.c @@ -662,10 +662,9 @@ static int dwapb_get_clks(struct dwapb_gpio *gpio) gpio->clks[1].id = "db"; err = devm_clk_bulk_get_optional(gpio->dev, DWAPB_NR_CLOCKS, gpio->clks); - if (err) { - dev_err(gpio->dev, "Cannot get APB/Debounce clocks\n"); - return err; - } + if (err) + return dev_err_probe(gpio->dev, err, + "Cannot get APB/Debounce clocks\n"); err = clk_bulk_prepare_enable(DWAPB_NR_CLOCKS, gpio->clks); if (err) { |