Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus

git-mirror · Jul 23, 2013 · 7c9e061 · 7c9e061
2 parents 3b2f64d + 9a9b1c6
commit 7c9e061
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
@@ -66,14 +66,19 @@ EXPORT_SYMBOL(ssc_request);
 
 void ssc_free(struct ssc_device *ssc)
 {
+	bool disable_clk = true;
+
 	spin_lock(&user_lock);
-	if (ssc->user) {
+	if (ssc->user)
 		ssc->user--;
-		clk_disable_unprepare(ssc->clk);
-	} else {
+	else {
+		disable_clk = false;
 		dev_dbg(&ssc->pdev->dev, "device already free\n");
 	}
 	spin_unlock(&user_lock);
+
+	if (disable_clk)
+		clk_disable_unprepare(ssc->clk);
 }
 EXPORT_SYMBOL(ssc_free);