summaryrefslogtreecommitdiff
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2016-10-24 13:17:17 -0400
committerSteven Rostedt <rostedt@goodmis.org>2016-10-24 13:17:17 -0400
commit1c92c30568ab32393e8a533ad7f64102a01a227d (patch)
tree0ed692d657026b510f73ce80d1d2a2d771217639 /drivers/tty/serial
parentd4a736159f9439b19096dab5d412b0c7dc33af9c (diff)
parent3afd8362fabd167bb04f79501f21dd67aa9cb99f (diff)
Merge tag 'v4.4.27' into v4.4-rt
This is the 4.4.27 stable release
Diffstat (limited to 'drivers/tty/serial')
-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 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;
}