From: Alan Cox <alan@linux.intel.com>
To: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, nico@cam.org
Subject: [PATCH 10/11] sdio_uart: Fix the locking on "func" for new code
Date: Tue, 03 Nov 2009 14:18:58 +0000 [thread overview]
Message-ID: <20091103141846.31032.81142.stgit@localhost.localdomain> (raw)
In-Reply-To: <20091103141525.31032.45206.stgit@localhost.localdomain>
The new dtr_rts function didn't take the port->func lock as it should
so add use of the lock there.
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
drivers/mmc/card/sdio_uart.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index ebb5d4b..0a3acfb 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -565,10 +565,14 @@ static void uart_dtr_rts(struct tty_port *tport, int onoff)
{
struct sdio_uart_port *port =
container_of(tport, struct sdio_uart_port, port);
+ int ret = sdio_uart_claim_func(port);
+ if (ret)
+ return;
if (onoff == 0)
sdio_uart_clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
else
sdio_uart_set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
+ sdio_uart_release_func(port);
}
/**
next prev parent reply other threads:[~2009-11-03 14:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-03 14:17 [PATCH 00/11] Sort out sdio_uart - stage two Alan Cox
2009-11-03 14:17 ` [PATCH 01/11] tty_port: Move hupcl handling Alan Cox
2009-11-03 14:17 ` [PATCH 02/11] sdio_uart: use tty_port Alan Cox
2009-11-03 14:17 ` [PATCH 03/11] sdio_uart: Fix oops caused by the previous changeset Alan Cox
2009-11-03 14:17 ` [PATCH 04/11] sdio_uart: refcount the tty objects Alan Cox
2009-11-03 14:18 ` [PATCH 05/11] sdio_uart: Move the open lock Alan Cox
2009-11-03 14:18 ` [PATCH 06/11] sdio_uart: Switch to the open/close helpers Alan Cox
2009-11-03 14:18 ` [PATCH 07/11] sdio_uart: Fix termios handling Alan Cox
2009-11-03 14:18 ` [PATCH 08/11] sdio_uart: Use kfifo instead of the messy circ stuff Alan Cox
2009-11-03 14:18 ` [PATCH 09/11] sdio_uart: Style fixes Alan Cox
2009-11-03 14:18 ` Alan Cox [this message]
2009-11-03 14:19 ` [PATCH 11/11] sdio_uart: add modem functionality Alan Cox
2009-11-03 19:58 ` [PATCH 00/11] Sort out sdio_uart - stage two Nicolas Pitre
2009-11-04 0:54 ` Alan Cox
2009-11-04 1:48 ` Nicolas Pitre
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=20091103141846.31032.81142.stgit@localhost.localdomain \
--to=alan@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=nico@cam.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox