|
@@ -165,7 +165,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream,
|
|
struct pxa2xx_pcm_dma_params *dma_data;
|
|
struct pxa2xx_pcm_dma_params *dma_data;
|
|
|
|
|
|
BUG_ON(IS_ERR(clk_i2s));
|
|
BUG_ON(IS_ERR(clk_i2s));
|
|
- clk_enable(clk_i2s);
|
|
|
|
|
|
+ clk_prepare_enable(clk_i2s);
|
|
clk_ena = 1;
|
|
clk_ena = 1;
|
|
pxa_i2s_wait();
|
|
pxa_i2s_wait();
|
|
|
|
|
|
@@ -258,7 +258,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream,
|
|
SACR0 &= ~SACR0_ENB;
|
|
SACR0 &= ~SACR0_ENB;
|
|
pxa_i2s_wait();
|
|
pxa_i2s_wait();
|
|
if (clk_ena) {
|
|
if (clk_ena) {
|
|
- clk_disable(clk_i2s);
|
|
|
|
|
|
+ clk_disable_unprepare(clk_i2s);
|
|
clk_ena = 0;
|
|
clk_ena = 0;
|
|
}
|
|
}
|
|
}
|
|
}
|