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:
40b4cf5
)
ASoC: rockchip: rk30_i2s.c use pinctrl_pm_select_sleep_state
author
黄涛
<huangtao@rock-chips.com>
Wed, 16 Jul 2014 05:00:42 +0000
(13:00 +0800)
committer
黄涛
<huangtao@rock-chips.com>
Wed, 16 Jul 2014 05:04:33 +0000
(13:04 +0800)
call pinctrl_select_state could trigger Oops when suspend
if pinctrl no configured.
sound/soc/rockchip/rk30_i2s.c
patch
|
blob
|
history
diff --git
a/sound/soc/rockchip/rk30_i2s.c
b/sound/soc/rockchip/rk30_i2s.c
index 72784ab2058a76fb972957cb35ed5415fa7807f1..cb5d532f1fcd3cf46c96aa010e04f04fe9729bbd 100755
(executable)
--- a/
sound/soc/rockchip/rk30_i2s.c
+++ b/
sound/soc/rockchip/rk30_i2s.c
@@
-494,14
+494,14
@@
static int rockchip_i2s_suspend_noirq(struct device *dev)
{
I2S_DBG("Enter %s, %d\n", __func__, __LINE__);
- return pinctrl_
select_state(dev->pins->p, dev->pins->sleep_state
);
+ return pinctrl_
pm_select_sleep_state(dev
);
}
static int rockchip_i2s_resume_noirq(struct device *dev)
{
I2S_DBG("Enter %s, %d\n", __func__, __LINE__);
- return pinctrl_
select_state(dev->pins->p, dev->pins->default_state
);
+ return pinctrl_
pm_select_default_state(dev
);
}
#else
#define rockchip_i2s_suspend_noirq NULL