From edc3cc50fe19e8b25f7c3762b9b394aa460a6ca1 Mon Sep 17 00:00:00 2001 From: James Sullins Date: Sun, 26 Feb 2012 17:25:15 -0600 Subject: [PATCH] qup_i2c_pwr_mgmt: use non-sleeping clk_* --- drivers/i2c/busses/i2c-qup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index c8b470721ae..e88e2ef7be0 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -324,13 +324,13 @@ qup_i2c_pwr_mgmt(struct qup_i2c_dev *dev, unsigned int state) { dev->clk_state = state; if (state != 0) { - clk_prepare_enable(dev->clk); - clk_prepare_enable(dev->pclk); + clk_enable(dev->clk); + clk_enable(dev->pclk); } else { qup_update_state(dev, QUP_RESET_STATE); - clk_disable_unprepare(dev->clk); + clk_disable(dev->clk); qup_config_core_on_en(dev); - clk_disable_unprepare(dev->pclk); + clk_disable(dev->pclk); } }