diff options
author | Semen Protsenko <semen.protsenko@globallogic.com> | 2015-04-30 11:35:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-08 08:20:50 -0400 |
commit | 66cf1d8473780fcb1a90e86fd19ba276520deb14 (patch) | |
tree | 8123e42a1048b49dfd8fc70d3ee606d6f5f630e3 | |
parent | 66c53aaa9c82766d4e9253748c6988441d8c2dc1 (diff) |
serial: omap: Fix error handling in probe
There is pm_qos_add_request() being executed on serial_omap_probe(),
which stores "&up->pm_qos_request" from omap-serial driver to
"pm_qos_array[PM_QOS_CPU_DMA_LATENCY]->constraints". If
serial_omap_probe() fails after pm_qos_add_request() (e.g. on
uart_add_one_port() call), pm_qos_array still keeping pm_qos_request
struct from omap-serial driver, which is not valid anymore (since driver
failed). This leads further to kernel crash on pm_qos_update_target(),
executing from some completely different driver.
We were observing this while trying to run audio playback while having
one of omap-serial driver instances failed on uart_add_one_port() call:
Unable to handle kernel paging request at virtual address fffffffc
Backtrace:
(plist_add) from (pm_qos_update_target)
(pm_qos_update_target) from (pm_qos_add_request)
(pm_qos_add_request) from (snd_pcm_hw_params)
(snd_pcm_hw_params) from (snd_pcm_common_ioctl1)
(snd_pcm_common_ioctl1) from (snd_pcm_playback_ioctl1)
(snd_pcm_playback_ioctl1) from (snd_pcm_playback_ioctl)
(snd_pcm_playback_ioctl) from (do_vfs_ioctl)
(do_vfs_ioctl) from (SyS_ioctl)
(SyS_ioctl) from (ret_fast_syscall)
This patch adds pm_qos_remove_request() on fail path in
serial_omap_probe() in order to fix this issue. While at it, free the
wakeup settings on fail path as well, just like it's done in
serial_omap_remove().
Signed-off-by: Semen Protsenko <semen.protsenko@globallogic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/omap-serial.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 211479aa34bb..7f49172ccd86 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c | |||
@@ -1735,6 +1735,8 @@ static int serial_omap_probe(struct platform_device *pdev) | |||
1735 | err_add_port: | 1735 | err_add_port: |
1736 | pm_runtime_put(&pdev->dev); | 1736 | pm_runtime_put(&pdev->dev); |
1737 | pm_runtime_disable(&pdev->dev); | 1737 | pm_runtime_disable(&pdev->dev); |
1738 | pm_qos_remove_request(&up->pm_qos_request); | ||
1739 | device_init_wakeup(up->dev, false); | ||
1738 | err_rs485: | 1740 | err_rs485: |
1739 | err_port_line: | 1741 | err_port_line: |
1740 | return ret; | 1742 | return ret; |