--- On Thu, 15/3/12, Philipp Zabel <pzabel@xxxxxx> wrote: > This patch adds > clk_prepare/clk_unprepare calls to the navpoint > driver by using the helper functions clk_prepare_enable and > clk_disable_unprepare. > > Signed-off-by: Philipp Zabel <philipp.zabel@xxxxxxxxx> > Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> > Cc: Paul Parsons <lost.distance@xxxxxxxxx> > --- > drivers/input/mouse/navpoint.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/mouse/navpoint.c > b/drivers/input/mouse/navpoint.c > index 253ec18..cb0d3b1 100644 > --- a/drivers/input/mouse/navpoint.c > +++ b/drivers/input/mouse/navpoint.c > @@ -225,7 +225,7 @@ static int navpoint_suspend(struct > device *dev) > > pxa_ssp_write_reg(ssp, SSCR0, 0); > > - clk_disable(ssp->clk); > + clk_disable_unprepare(ssp->clk); > > return 0; > } > @@ -236,7 +236,7 @@ static int navpoint_resume(struct device > *dev) > struct ssp_device *ssp = > drv_data->ssp; > int timeout; > > - clk_enable(ssp->clk); > + clk_prepare_enable(ssp->clk); > > pxa_ssp_write_reg(ssp, SSCR1, sscr1); > pxa_ssp_write_reg(ssp, SSSR, sssr); > -- > 1.7.9.1 AFAIK the navpoint driver itself has yet to be accepted. Acked-by: Paul Parsons <lost.distance@xxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html