All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] pcmcia/vrc4171: use local spinlock for device local lock.
@ 2010-03-10  6:57 Yoichi Yuasa
  2010-03-10 20:35 ` Dominik Brodowski
  0 siblings, 1 reply; 2+ messages in thread
From: Yoichi Yuasa @ 2010-03-10  6:57 UTC (permalink / raw)
  To: Dominik Brodowski; +Cc: yuasa, linux-pcmcia, Ralf Baechle, linux-mips

struct pcmcia_socket lock had been used before.

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
 drivers/pcmcia/vrc4171_card.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
index c9fcbdc..aaccdb9 100644
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/drivers/pcmcia/vrc4171_card.c
@@ -105,6 +105,7 @@ typedef struct vrc4171_socket {
 	char name[24];
 	int csc_irq;
 	int io_irq;
+	spinlock_t lock;
 } vrc4171_socket_t;
 
 static vrc4171_socket_t vrc4171_sockets[CARD_MAX_SLOTS];
@@ -327,7 +328,7 @@ static int pccard_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
 	slot = sock->sock;
 	socket = &vrc4171_sockets[slot];
 
-	spin_lock_irq(&sock->lock);
+	spin_lock_irq(&socket->lock);
 
 	voltage = set_Vcc_value(state->Vcc);
 	exca_write_byte(slot, CARD_VOLTAGE_SELECT, voltage);
@@ -370,7 +371,7 @@ static int pccard_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
 		cscint |= I365_CSC_DETECT;
         exca_write_byte(slot, I365_CSCINT, cscint);
 
-	spin_unlock_irq(&sock->lock);
+	spin_unlock_irq(&socket->lock);
 
 	return 0;
 }
-- 
1.7.0.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] pcmcia/vrc4171: use local spinlock for device local lock.
  2010-03-10  6:57 [PATCH] pcmcia/vrc4171: use local spinlock for device local lock Yoichi Yuasa
@ 2010-03-10 20:35 ` Dominik Brodowski
  0 siblings, 0 replies; 2+ messages in thread
From: Dominik Brodowski @ 2010-03-10 20:35 UTC (permalink / raw)
  To: Yoichi Yuasa; +Cc: linux-pcmcia, Ralf Baechle, linux-mips

Hey,

On Wed, Mar 10, 2010 at 03:57:56PM +0900, Yoichi Yuasa wrote:
> struct pcmcia_socket lock had been used before.

Applied, thanks.

	Dominik

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-03-10 20:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-10  6:57 [PATCH] pcmcia/vrc4171: use local spinlock for device local lock Yoichi Yuasa
2010-03-10 20:35 ` Dominik Brodowski

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.