All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shubhrajyoti D <shubhrajyoti@ti.com>
To: linux-serial@vger.kernel.org
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	Shubhrajyoti D <shubhrajyoti@ti.com>,
	stable@vger.kernel.org, "Govindraj.R" <govindraj.raja@ti.com>
Subject: [PATCH 2/7] UART: OMAP: Cut the clock in the error cases
Date: Mon, 16 Apr 2012 20:36:56 +0530	[thread overview]
Message-ID: <1334588821-5224-3-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1334588821-5224-1-git-send-email-shubhrajyoti@ti.com>

In the error cases the clock cut is missed. This patch intends to fix the
same.

Cc: stable@vger.kernel.org
Cc: Govindraj.R <govindraj.raja@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
 drivers/tty/serial/omap-serial.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index fe099bb..10e80bb 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -319,6 +319,8 @@ static void serial_omap_start_tx(struct uart_port *port)
 
 		if (ret < 0) {
 			serial_omap_enable_ier_thri(up);
+			pm_runtime_mark_last_busy(&up->pdev->dev);
+			pm_runtime_put_autosuspend(&up->pdev->dev);
 			return;
 		}
 	}
@@ -1029,8 +1031,10 @@ static int serial_omap_poll_get_char(struct uart_port *port)
 
 	pm_runtime_get_sync(&up->pdev->dev);
 	status = serial_in(up, UART_LSR);
-	if (!(status & UART_LSR_DR))
+	if (!(status & UART_LSR_DR)) {
+		pm_runtime_put(&up->pdev->dev);
 		return NO_POLL_CHAR;
+	}
 
 	status = serial_in(up, UART_RX);
 	pm_runtime_put(&up->pdev->dev);
-- 
1.7.4.1


WARNING: multiple messages have this Message-ID (diff)
From: shubhrajyoti@ti.com (Shubhrajyoti D)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/7] UART: OMAP: Cut the clock in the error cases
Date: Mon, 16 Apr 2012 20:36:56 +0530	[thread overview]
Message-ID: <1334588821-5224-3-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1334588821-5224-1-git-send-email-shubhrajyoti@ti.com>

In the error cases the clock cut is missed. This patch intends to fix the
same.

Cc: stable at vger.kernel.org
Cc: Govindraj.R <govindraj.raja@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
 drivers/tty/serial/omap-serial.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index fe099bb..10e80bb 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -319,6 +319,8 @@ static void serial_omap_start_tx(struct uart_port *port)
 
 		if (ret < 0) {
 			serial_omap_enable_ier_thri(up);
+			pm_runtime_mark_last_busy(&up->pdev->dev);
+			pm_runtime_put_autosuspend(&up->pdev->dev);
 			return;
 		}
 	}
@@ -1029,8 +1031,10 @@ static int serial_omap_poll_get_char(struct uart_port *port)
 
 	pm_runtime_get_sync(&up->pdev->dev);
 	status = serial_in(up, UART_LSR);
-	if (!(status & UART_LSR_DR))
+	if (!(status & UART_LSR_DR)) {
+		pm_runtime_put(&up->pdev->dev);
 		return NO_POLL_CHAR;
+	}
 
 	status = serial_in(up, UART_RX);
 	pm_runtime_put(&up->pdev->dev);
-- 
1.7.4.1

  parent reply	other threads:[~2012-04-16 15:06 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-16 15:06 [PATCH 0/7] UART: OMAP: Updates Shubhrajyoti D
2012-04-16 15:06 ` Shubhrajyoti D
2012-04-16 15:06 ` [PATCH 1/7] ARM: OMAP: UART: Make context_loss_cnt signed Shubhrajyoti D
2012-04-16 15:06   ` Shubhrajyoti D
2012-04-16 15:06 ` Shubhrajyoti D [this message]
2012-04-16 15:06   ` [PATCH 2/7] UART: OMAP: Cut the clock in the error cases Shubhrajyoti D
2012-04-18  0:06   ` Kevin Hilman
2012-04-18  0:06     ` Kevin Hilman
2012-04-18  6:44     ` Shubhrajyoti
2012-04-18  6:44       ` Shubhrajyoti
2012-04-18 14:00       ` Kevin Hilman
2012-04-18 14:00         ` Kevin Hilman
2012-04-18 15:13         ` Shubhrajyoti
2012-04-18 15:13           ` Shubhrajyoti
2012-04-20 13:20           ` Shubhrajyoti Datta
2012-04-20 13:20             ` Shubhrajyoti Datta
2012-04-20 13:46             ` Kevin Hilman
2012-04-20 13:46               ` Kevin Hilman
2012-04-16 15:06 ` [PATCH 3/7] UART: OMAP: fix software flow control Shubhrajyoti D
2012-04-16 15:06   ` Shubhrajyoti D
2012-04-16 15:06 ` [PATCH 4/7] UART: OMAP: Remove the default setting of special character Shubhrajyoti D
2012-04-16 15:06   ` Shubhrajyoti D
2012-04-16 15:06 ` [PATCH 5/7] UART: OMAP: Prevent cutting of clocks if put_sync immediately follows Shubhrajyoti D
2012-04-16 15:06   ` Shubhrajyoti D
2012-04-16 15:07 ` [PATCH 6/7] UART: OMAP: Remove the hardcode serial_omap_console_ports array Shubhrajyoti D
2012-04-16 15:07   ` Shubhrajyoti D
2012-04-16 15:07 ` [PATCH 7/7] UART: OMAP: Trivial optimisation of the probe and remove Shubhrajyoti D
2012-04-16 15:07   ` Shubhrajyoti D

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1334588821-5224-3-git-send-email-shubhrajyoti@ti.com \
    --to=shubhrajyoti@ti.com \
    --cc=govindraj.raja@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.