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

clk: sa1111: convert to clk_prepare()/clk_unprepare()

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

+8 -1
+8 -1
arch/arm/common/sa1111.c
··· 718 718 goto err_free; 719 719 } 720 720 721 + ret = clk_prepare(sachip->clk); 722 + if (ret) 723 + goto err_clkput; 724 + 721 725 spin_lock_init(&sachip->lock); 722 726 723 727 sachip->dev = me; ··· 737 733 sachip->base = ioremap(mem->start, PAGE_SIZE * 2); 738 734 if (!sachip->base) { 739 735 ret = -ENOMEM; 740 - goto err_clkput; 736 + goto err_clk_unprep; 741 737 } 742 738 743 739 /* ··· 813 809 814 810 err_unmap: 815 811 iounmap(sachip->base); 812 + err_clk_unprep: 813 + clk_unprepare(sachip->clk); 816 814 err_clkput: 817 815 clk_put(sachip->clk); 818 816 err_free: ··· 841 835 sa1111_writel(0, irqbase + SA1111_WAKEEN1); 842 836 843 837 clk_disable(sachip->clk); 838 + clk_unprepare(sachip->clk); 844 839 845 840 if (sachip->irq != NO_IRQ) { 846 841 irq_set_chained_handler(sachip->irq, NULL);