Skip to contentSkip to conversation

pcmcia/vrc4171: use local spinlock for device local lock.

PATCH Applied Yoichi Yuasa 2 participants 2 messages Mar 10, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pcmcia/vrc4171: use local spinlock for device local lock.

struct pcmcia_socket lock had been used before.

---
 drivers/pcmcia/vrc4171_card.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/pcmcia/vrc4171_card.c +3 -2
index c9fcbdc..aaccdb9 100644
@@ -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;
 }
Signature · 1 line
1.7.0.2
maintainer Applied
#1 lore raw

Hey,

Quoted 1 line · Yoichi Yuasa

struct pcmcia_socket lock had been used before.

Applied, thanks.

Dominik