Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: amba bus: convert to clk_prepare()/clk_unprepare()

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

+11 -2
+11 -2
drivers/amba/bus.c
··· 460 460 if (IS_ERR(pclk)) 461 461 return PTR_ERR(pclk); 462 462 463 - ret = clk_enable(pclk); 464 - if (ret) 463 + ret = clk_prepare(pclk); 464 + if (ret) { 465 465 clk_put(pclk); 466 + return ret; 467 + } 468 + 469 + ret = clk_enable(pclk); 470 + if (ret) { 471 + clk_unprepare(pclk); 472 + clk_put(pclk); 473 + } 466 474 467 475 return ret; 468 476 } ··· 480 472 struct clk *pclk = pcdev->pclk; 481 473 482 474 clk_disable(pclk); 475 + clk_unprepare(pclk); 483 476 clk_put(pclk); 484 477 } 485 478