From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 16 Jul 2014 05:00:42 +0000 (+0800)
Subject: ASoC: rockchip: rk30_i2s.c use pinctrl_pm_select_sleep_state
X-Git-Tag: firefly_0821_release~4916^2~229
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=678b7168ad9ef36907088df146c2990ea4258bfd;p=firefly-linux-kernel-4.4.55.git

ASoC: rockchip: rk30_i2s.c use pinctrl_pm_select_sleep_state

call pinctrl_select_state could trigger Oops when suspend
if pinctrl no configured.
---

diff --git a/sound/soc/rockchip/rk30_i2s.c b/sound/soc/rockchip/rk30_i2s.c
index 72784ab2058a..cb5d532f1fcd 100755
--- 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