diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2013-06-06 01:28:12 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-06 13:07:05 -0700 |
| commit | 9f6d20ff848c23506c2ec55431479cb350179886 (patch) | |
| tree | 1670aae9b3bf74a9ad6afdfc02c4e57d4940bcee /drivers/tty | |
| parent | 7f25301d83432efb0e7bb3fba288001a7bb03fdb (diff) | |
| download | blackbird-op-linux-9f6d20ff848c23506c2ec55431479cb350179886.tar.gz blackbird-op-linux-9f6d20ff848c23506c2ec55431479cb350179886.zip | |
tty/serial/sirf: fix error propagation in sirfsoc_uart_probe()
If pinctrl_get_select_default() fails, sirfsoc_uart_probe()
returns IS_ERR(result) instead of PTR_ERR(result).
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sirfsoc_uart.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c index 03465b673945..1fd564b8194b 100644 --- a/drivers/tty/serial/sirfsoc_uart.c +++ b/drivers/tty/serial/sirfsoc_uart.c @@ -687,9 +687,10 @@ int sirfsoc_uart_probe(struct platform_device *pdev) if (sirfport->hw_flow_ctrl) { sirfport->p = pinctrl_get_select_default(&pdev->dev); - ret = IS_ERR(sirfport->p); - if (ret) + if (IS_ERR(sirfport->p)) { + ret = PTR_ERR(sirfport->p); goto err; + } } sirfport->clk = clk_get(&pdev->dev, NULL); |
