diff options
| author | Fernando Guzman Lugo | 2015-06-11 04:39:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-06-13 02:39:50 +0200 |
| commit | ff0daa1c1a28c9866d735852a1cbfb9c757aaa7b (patch) | |
| tree | 9281508e59138fc2844d277a6630e39095994c55 | |
| parent | serial: 8250_pci: Correct uartclk for xr17v35x expansion chips (diff) | |
| download | kernel-qcow2-linux-ff0daa1c1a28c9866d735852a1cbfb9c757aaa7b.tar.gz kernel-qcow2-linux-ff0daa1c1a28c9866d735852a1cbfb9c757aaa7b.tar.xz kernel-qcow2-linux-ff0daa1c1a28c9866d735852a1cbfb9c757aaa7b.zip | |
serial: sprd: check for NULL after calling devm_clk_get
In platforms which does not use CLK framework (HAVE_CLK not set), the
clk_* functions return NULL instead of an error. This patch handles that
scenario.
Signed-off-by: Fernando Guzman Lugo <fernando.guzman.lugo@intel.com>
Signed-off-by: Chunyan Zhang <chunyan.zhang@spreadtrum.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/sprd_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c index 582d2729f700..3866516c2926 100644 --- a/drivers/tty/serial/sprd_serial.c +++ b/drivers/tty/serial/sprd_serial.c @@ -716,7 +716,7 @@ static int sprd_probe(struct platform_device *pdev) up->flags = UPF_BOOT_AUTOCONF; clk = devm_clk_get(&pdev->dev, NULL); - if (!IS_ERR(clk)) + if (!IS_ERR_OR_NULL(clk)) up->uartclk = clk_get_rate(clk); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |