aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-13 08:10:45 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-13 08:10:45 +0200
commitda0f843e6e6ff23790e9d97a05dc555ee2e3fa11 (patch)
tree33ad57fd3d8b4529f153d34fa633df3278a85c85 /drivers/tty
parenttty: serial: msm_serial: avoid system lockup condition (diff)
downloadlinux-dev-da0f843e6e6ff23790e9d97a05dc555ee2e3fa11.tar.xz
linux-dev-da0f843e6e6ff23790e9d97a05dc555ee2e3fa11.zip
Revert "serial: stm32: select pinctrl state in each suspend/resume function"
This reverts commit c70669ecef4e34af8913108fae4b8a9b1dc63fa1 as it breaks the build. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Reported-by: kbuild test robot <lkp@intel.com> Cc: Bich Hemon <bich.hemon@st.com> Cc: Erwan Le Ray <erwan.leray@st.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/stm32-usart.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index 7a46d7ba967e..c6a9293a430f 100644
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -1295,8 +1295,6 @@ static int stm32_serial_suspend(struct device *dev)
else
stm32_serial_enable_wakeup(port, false);
- pinctrl_pm_select_sleep_state(dev);
-
return 0;
}
@@ -1304,8 +1302,6 @@ static int stm32_serial_resume(struct device *dev)
{
struct uart_port *port = dev_get_drvdata(dev);
- pinctrl_pm_select_default_state(dev);
-
if (device_may_wakeup(dev))
stm32_serial_enable_wakeup(port, false);