diff options
| author | Tom Rini <trini@konsulko.com> | 2024-01-30 07:54:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-30 07:54:28 -0500 |
| commit | 28760ce8640ff6266bd1c1c568a4a231576f3919 (patch) | |
| tree | 291fa96c3ed6d8e22d0fe6df906007cd650f555d /drivers/mtd/nand/raw/atmel/nand-controller.c | |
| parent | 6faba41927bdc8973b59678649ef83c564cc421e (diff) | |
| parent | a8dc4965f09d28a59c156437673ddb66860c847e (diff) | |
Merge tag 'clk-2024.04-rc2' of https://source.denx.de/u-boot/custodians/u-boot-clk
Clock changes for v2024.04
This pull has the usual fixes and new (clock-adjacent) drivers. It also has some
cleanups for the clock API; in particular removing the unused rfree callback.
CI: https://source.denx.de/u-boot/custodians/u-boot-clk/-/pipelines/19486
Diffstat (limited to 'drivers/mtd/nand/raw/atmel/nand-controller.c')
| -rw-r--r-- | drivers/mtd/nand/raw/atmel/nand-controller.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c index a2151f98491..0e0441472b8 100644 --- a/drivers/mtd/nand/raw/atmel/nand-controller.c +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c @@ -1999,10 +1999,8 @@ atmel_hsmc_nand_controller_remove(struct atmel_nand_controller *nc) hsmc_nc = container_of(nc, struct atmel_hsmc_nand_controller, base); - if (hsmc_nc->clk) { + if (hsmc_nc->clk) clk_disable_unprepare(hsmc_nc->clk); - devm_clk_put(nc->dev, hsmc_nc->clk); - } return 0; } |