Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

serial: sc16is7xx: Correct initialization of s->clk

Browse source 
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: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jon Ringle <jringle@gridpoint.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jon Ringle 2014-07-25 13:53:36 -04:00 committed by Greg Kroah-Hartman
parent c8ed99d4f6
commit dc824ebed0
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/tty/serial/sc16is7xx.c
View file

@ -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;