From bfa5ba8cbb0bbcba003254b22ed0fd598b501741 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Thu, 31 Jan 2013 11:53:40 +0800 Subject: [PATCH] --- yaml --- r: 353355 b: refs/heads/master c: 151edfc757babd94d8b6c64d84a9ccf8f3c53320 h: refs/heads/master i: 353353: ad90e50b8ef0d32e9ca7d36d7cdeb9ea245d0346 353351: 769423dbea1eb9d9c94279180294c3996ced1f8f v: v3 --- [refs] | 2 +- trunk/sound/soc/atmel/sam9g20_wm8731.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1c61b4eb9920..7718176d9131 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69706028b94f10a2dc0a28af65e84ec6fd38054b +refs/heads/master: 151edfc757babd94d8b6c64d84a9ccf8f3c53320 diff --git a/trunk/sound/soc/atmel/sam9g20_wm8731.c b/trunk/sound/soc/atmel/sam9g20_wm8731.c index da976291da9e..2d6fbd0125b9 100644 --- a/trunk/sound/soc/atmel/sam9g20_wm8731.c +++ b/trunk/sound/soc/atmel/sam9g20_wm8731.c @@ -305,10 +305,10 @@ static int at91sam9g20ek_audio_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); - atmel_ssc_put_audio(0); - snd_soc_unregister_card(card); - clk_put(mclk); + clk_disable(mclk); mclk = NULL; + snd_soc_unregister_card(card); + atmel_ssc_put_audio(0); return 0; }