From e81ee8b91321f9da36bf75059701f231d195885a Mon Sep 17 00:00:00 2001
From: dmitry pervushin <dimka@nomadgs.com>
Date: Tue, 24 Apr 2007 13:41:12 +0900
Subject: [PATCH] --- yaml --- r: 54367 b: refs/heads/master c:
 1534a3b3dc1cbab006f0add253be1b095d738b82 h: refs/heads/master i:   54365:
 b17157ddf9447d600f6ef3e6643d32637f258644   54363:
 aef50b93ca8842e98eefc2fd6f55d36820764b3f   54359:
 e0d57b62970defa403205c45509178cabe589480   54351:
 3067974ebc84d1c7f606046a7e64bd999df703c1   54335:
 602210dfda7922adc25ed4524b10a0e54de0e5e4 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/serial/sh-sci.c | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bed4c472cbc1..05d0f6fb18a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1929cb340b74904c130fdf3de3fe5bbedb68a5aa
+refs/heads/master: 1534a3b3dc1cbab006f0add253be1b095d738b82
diff --git a/trunk/drivers/serial/sh-sci.c b/trunk/drivers/serial/sh-sci.c
index 0a34fa9e0733..e5cf57f482cf 100644
--- a/trunk/drivers/serial/sh-sci.c
+++ b/trunk/drivers/serial/sh-sci.c
@@ -77,6 +77,9 @@ struct sci_port {
 	/* Break timer */
 	struct timer_list	break_timer;
 	int			break_flag;
+
+	/* Port clock */
+	struct clk		*clk;
 };
 
 #ifdef CONFIG_SH_KGDB
@@ -955,6 +958,8 @@ static int sci_startup(struct uart_port *port)
 	if (s->enable)
 		s->enable(port);
 
+	s->clk = clk_get(NULL, "module_clk");
+
 	sci_request_irq(s);
 	sci_start_tx(port);
 	sci_start_rx(port, 1);
@@ -972,6 +977,9 @@ static void sci_shutdown(struct uart_port *port)
 
 	if (s->disable)
 		s->disable(port);
+
+	clk_put(s->clk);
+	s->clk = NULL;
 }
 
 static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
@@ -990,9 +998,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
 		default:
 		{
 #if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
-			struct clk *clk = clk_get(NULL, "module_clk");
-			t = SCBRR_VALUE(baud, clk_get_rate(clk));
-			clk_put(clk);
+			t = SCBRR_VALUE(baud, clk_get_rate(s->clk));
 #else
 			t = SCBRR_VALUE(baud);
 #endif