diff options
| author | Pawel Moll <pawel.moll@arm.com> | 2012-09-19 11:10:47 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-19 14:56:36 -0700 |
| commit | 59d1f5c41a21f0d87973f2dedd40efd927a201d6 (patch) | |
| tree | e2365b17acfe93b5716ece0921fdb5b4bd0be19a /drivers/input | |
| parent | 8669cf6793bb38307a30fb6b9565ddc8840ebd3f (diff) | |
| download | linux-59d1f5c41a21f0d87973f2dedd40efd927a201d6.tar.gz linux-59d1f5c41a21f0d87973f2dedd40efd927a201d6.tar.bz2 linux-59d1f5c41a21f0d87973f2dedd40efd927a201d6.zip | |
Input: ambakmi - [un]prepare clocks when enabling amd disabling
Clocks must be prepared before enabling and unprepared
after disabling. Use appropriate functions to do this
in one go.
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/ambakmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c index 2ffd110bd5bc..2e77246c2e5a 100644 --- a/drivers/input/serio/ambakmi.c +++ b/drivers/input/serio/ambakmi.c @@ -72,7 +72,7 @@ static int amba_kmi_open(struct serio *io) unsigned int divisor; int ret; - ret = clk_enable(kmi->clk); + ret = clk_prepare_enable(kmi->clk); if (ret) goto out; @@ -92,7 +92,7 @@ static int amba_kmi_open(struct serio *io) return 0; clk_disable: - clk_disable(kmi->clk); + clk_disable_unprepare(kmi->clk); out: return ret; } @@ -104,7 +104,7 @@ static void amba_kmi_close(struct serio *io) writeb(0, KMICR); free_irq(kmi->irq, kmi); - clk_disable(kmi->clk); + clk_disable_unprepare(kmi->clk); } static int __devinit amba_kmi_probe(struct amba_device *dev, |