提交 dc824ebe 编写于 作者: J Jon Ringle 提交者: Greg Kroah-Hartman

serial: sc16is7xx: Correct initialization of s->clk

The s->clk never gets setup in sc16is7xx_probe() and instead was using a
local clk variable, but then testing the uninitialized s->clk during
teardown
Reported-by: NDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: NJon Ringle <jringle@gridpoint.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 c8ed99d4
......@@ -1060,7 +1060,6 @@ static int sc16is7xx_probe(struct device *dev,
struct regmap *regmap, int irq, unsigned long flags)
{
unsigned long freq, *pfreq = dev_get_platdata(dev);
struct clk *clk;
int i, ret;
struct sc16is7xx_port *s;
......@@ -1076,14 +1075,14 @@ static int sc16is7xx_probe(struct device *dev,
return -ENOMEM;
}
clk = devm_clk_get(dev, NULL);
if (IS_ERR(clk)) {
s->clk = devm_clk_get(dev, NULL);
if (IS_ERR(s->clk)) {
if (pfreq)
freq = *pfreq;
else
return PTR_ERR(clk);
return PTR_ERR(s->clk);
} else {
freq = clk_get_rate(clk);
freq = clk_get_rate(s->clk);
}
s->regmap = regmap;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册