projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4924ca9
)
Revert "i2s: early initialization spin_lock for regiter read/write"
author
黄涛
<huangtao@rock-chips.com>
Tue, 17 Sep 2013 04:20:51 +0000
(12:20 +0800)
committer
黄涛
<huangtao@rock-chips.com>
Tue, 17 Sep 2013 04:20:51 +0000
(12:20 +0800)
This reverts commit
e774f49a4e01e95a2e1aba8c888ed0bef0d404f8
.
sound/soc/rk29/rk30_i2s.c
patch
|
blob
|
history
diff --git
a/sound/soc/rk29/rk30_i2s.c
b/sound/soc/rk29/rk30_i2s.c
index b38de18b7695b80791300e55618b531ae356a20b..801464e94b7658399a9727d16f934ce283e9963b 100755
(executable)
--- 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: