summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKefeng Wang <wangkefeng.wang@huawei.com>2016-08-24 16:33:33 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-22 12:06:46 +0200
commit0c33f651585ccd1d07875d2a3a71a0c11520cb3b (patch)
tree66fddbb44f50dda632dbd4dd1c7c3ff3f3993b09
parent2229308774bf777bef0288a24cc0ebd43e6e8aa5 (diff)
downloadlinux-stable-0c33f651585ccd1d07875d2a3a71a0c11520cb3b.tar.gz
linux-stable-0c33f651585ccd1d07875d2a3a71a0c11520cb3b.tar.bz2
linux-stable-0c33f651585ccd1d07875d2a3a71a0c11520cb3b.zip
serial: 8250_dw: Check the data->pclk when get apb_pclk
commit e16b46f190a22587898b331f9d58583b0b166c9a upstream. It should check the data->pclk, not data->clk when get apb_pclk. Fixes: c8ed99d4f6a8("serial: 8250_dw: Add support for deferred probing") Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Tested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250_dw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index e19969614203..b022f5a01e63 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -462,7 +462,7 @@ static int dw8250_probe(struct platform_device *pdev)
}
data->pclk = devm_clk_get(&pdev->dev, "apb_pclk");
- if (IS_ERR(data->clk) && PTR_ERR(data->clk) == -EPROBE_DEFER) {
+ if (IS_ERR(data->pclk) && PTR_ERR(data->pclk) == -EPROBE_DEFER) {
err = -EPROBE_DEFER;
goto err_clk;
}