From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 17 Sep 2013 04:20:51 +0000 (+0800)
Subject: Revert "i2s: early initialization spin_lock for regiter read/write"
X-Git-Tag: firefly_0821_release~6624
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8a83cc2820c6468afcda4d7d0832eb8b5f2ef8e1;p=firefly-linux-kernel-4.4.55.git

Revert "i2s: early initialization spin_lock for regiter read/write"

This reverts commit e774f49a4e01e95a2e1aba8c888ed0bef0d404f8.
---

diff --git a/sound/soc/rk29/rk30_i2s.c b/sound/soc/rk29/rk30_i2s.c
index b38de18b7695..801464e94b76 100755
--- a/sound/soc/rk29/rk30_i2s.c
+++ b/sound/soc/rk29/rk30_i2s.c
@@ -636,7 +636,6 @@ static int __devinit rockchip_i2s_probe(struct platform_device *pdev)
 	struct snd_soc_dai_driver *dai;
 	int    ret;
 
-	spin_lock_init(&i2s->spinlock_wr);
 #if defined(CONFIG_SND_I2S_USE_18V)	
 	writel_relaxed(0x2000200,RK30_GRF_BASE + GRF_IO_CON4);//bit9: 1,1.8v;0,3.3v
 #elif defined(CONFIG_SND_I2S_USE_33V)
@@ -765,6 +764,7 @@ static int __devinit rockchip_i2s_probe(struct platform_device *pdev)
 	if (ret != 0)
 		goto err_i2sv2;
 
+	spin_lock_init(&i2s->spinlock_wr);
 	return 0;
 
 err_i2sv2: