summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorJakub Kicinski <kubakici@wp.pl>2015-03-17 00:28:49 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-26 22:38:36 +0100
commit0814e8d5da2b6f25088fe28d5e23f511d8441883 (patch)
tree31f703cce2374cbb4e149e6620c1c3c5d69ad97b /drivers/tty
parent9764e7a0f63bda5664cb985f992002c6eccef641 (diff)
downloadlinux-stable-0814e8d5da2b6f25088fe28d5e23f511d8441883.tar.gz
linux-stable-0814e8d5da2b6f25088fe28d5e23f511d8441883.tar.bz2
linux-stable-0814e8d5da2b6f25088fe28d5e23f511d8441883.zip
sc16is7xx: enable the clock
Although clk_disable_unprepare() is called both on .remove() and in .probe() error path, the clock is never actually enabled. Signed-off-by: Jakub Kicinski <kubakici@wp.pl> Signed-off-by: Jon Ringle <jringle@gridpoint.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/sc16is7xx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index e6b396e584f3..36b3c266925d 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -1050,6 +1050,7 @@ static int sc16is7xx_probe(struct device *dev,
else
return PTR_ERR(s->clk);
} else {
+ clk_prepare_enable(s->clk);
freq = clk_get_rate(s->clk);
}