Skip to content

Commit

Permalink
Input: ambakmi - [un]prepare clocks when enabling amd disabling
Browse files Browse the repository at this point in the history
Clocks must be prepared before enabling and unprepared
after disabling. Use appropriate functions to do this
in one go.

Signed-off-by: Pawel Moll <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
  • Loading branch information
pawelmoll authored and dtor committed Sep 19, 2012
1 parent 8669cf6 commit 59d1f5c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/input/serio/ambakmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}
Expand All @@ -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,
Expand Down

0 comments on commit 59d1f5c

Please sign in to comment.