diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-24 12:30:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-24 12:30:07 +0800 |
| commit | 5c713517b6fbd969659f56214129b76dd9ba13a3 (patch) | |
| tree | 00c3ed8efcbf7b1dc83f48ce493014cd3f717996 /drivers/tty/serial | |
| parent | 2c23adcbadee2920784fe7e6b01f180d6da304c2 (diff) | |
| parent | 59628a48e83c96ae3d6426391d93281e53c48462 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/8250/8250_dw.c | 2 |
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 a5d319e4aae6..8435c3f204c1 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -440,7 +440,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; } |