Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 519b371dcd3b175bcffa97bc88a7122e41afd318

Authored by Stephen Boyd
Committed by David Brown
1 parent f98cf83d0c
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

msm_serial: Use devm_clk_get() and properly return errors 

Clocks are not clk_put() in this driver's error paths during
probe. The code that checks for clock errors also fails to
properly return the error code from the pclk member if it turns
out to be the failing clock, leading to potentially confusing
error values if the clk member is not an error pointer. Fix these
problems with devm_clk_get() and proper error checking.

Removing the clk_put() in msm_serial_remove() also points out
that msm_port is unused. Furthermore, msm_port is the wrong type
and so the clk_put() would be using the wrong pointer. Replace it
with the proper type and call uart_remove_one_port() to do the
proper cleanup.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David Brown <davidb@codeaurora.org>

Showing 1 changed file with 12 additions and 9 deletions Side-by-side Diff

drivers/tty/serial/msm_serial.c
Diff comments   View file @ 519b371
... ... @@ -884,19 +884,22 @@
884 884 msm_port->is_uartdm = 0;
885 885  
886 886 if (msm_port->is_uartdm) {
887   - msm_port->clk = clk_get(&pdev->dev, "gsbi_uart_clk");
888   - msm_port->pclk = clk_get(&pdev->dev, "gsbi_pclk");
  887 + msm_port->clk = devm_clk_get(&pdev->dev, "gsbi_uart_clk");
  888 + msm_port->pclk = devm_clk_get(&pdev->dev, "gsbi_pclk");
889 889 } else {
890   - msm_port->clk = clk_get(&pdev->dev, "uart_clk");
  890 + msm_port->clk = devm_clk_get(&pdev->dev, "uart_clk");
891 891 msm_port->pclk = ERR_PTR(-ENOENT);
892 892 }
893 893  
894   - if (unlikely(IS_ERR(msm_port->clk) || (IS_ERR(msm_port->pclk) &&
895   - msm_port->is_uartdm)))
896   - return PTR_ERR(msm_port->clk);
  894 + if (IS_ERR(msm_port->clk))
  895 + return PTR_ERR(msm_port->clk);
897 896  
898   - if (msm_port->is_uartdm)
  897 + if (msm_port->is_uartdm) {
  898 + if (IS_ERR(msm_port->pclk))
  899 + return PTR_ERR(msm_port->pclk);
  900 +
899 901 clk_set_rate(msm_port->clk, 1843200);
  902 + }
900 903  
901 904 port->uartclk = clk_get_rate(msm_port->clk);
902 905 printk(KERN_INFO "uartclk = %d\n", port->uartclk);
903 906  
... ... @@ -919,9 +922,9 @@
919 922  
920 923 static int msm_serial_remove(struct platform_device *pdev)
921 924 {
922   - struct msm_port *msm_port = platform_get_drvdata(pdev);
  925 + struct uart_port *port = platform_get_drvdata(pdev);
923 926  
924   - clk_put(msm_port->clk);
  927 + uart_remove_one_port(&msm_uart_driver, port);
925 928  
926 929 return 0;
927 930 }