diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2022-04-22 10:56:00 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-04-22 10:56:00 +0300 |
| commit | f70925bf99406150d8133e775e49c9c459f78733 (patch) | |
| tree | 392dd3854bf229c0c94b481819e4a67551ba6895 /arch/arm/mach-ep93xx/clock.c | |
| parent | 9c8774e629a1950c24b44e3c8fb93d76fb644b49 (diff) | |
| parent | 59f0c2447e2553b0918b4a9fd38763a5c0587d02 (diff) | |
| download | linux-f70925bf99406150d8133e775e49c9c459f78733.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/microchip/lan966x/lan966x_main.c
d08ed852560e ("net: lan966x: Make sure to release ptp interrupt")
c8349639324a ("net: lan966x: Add FDMA functionality")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'arch/arm/mach-ep93xx/clock.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/clock.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c index cc75087134d3..4fa6ea5461b7 100644 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c @@ -148,8 +148,10 @@ static struct clk_hw *ep93xx_clk_register_gate(const char *name, psc->lock = &clk_lock; clk = clk_register(NULL, &psc->hw); - if (IS_ERR(clk)) + if (IS_ERR(clk)) { kfree(psc); + return ERR_CAST(clk); + } return &psc->hw; } @@ -207,7 +209,7 @@ static int ep93xx_mux_determine_rate(struct clk_hw *hw, struct clk_rate_request *req) { unsigned long rate = req->rate; - struct clk *best_parent = 0; + struct clk *best_parent = NULL; unsigned long __parent_rate; unsigned long best_rate = 0, actual_rate, mclk_rate; unsigned long best_parent_rate; |