projects
/
profile
/
common
/
kernel-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a3d3203
)
pcmcia/vrc4171: use local spinlock for device local lock.
author
Yoichi Yuasa
<yuasa@linux-mips.org>
Wed, 10 Mar 2010 06:57:56 +0000
(15:57 +0900)
committer
Dominik Brodowski
<linux@dominikbrodowski.net>
Mon, 15 Mar 2010 13:50:12 +0000
(14:50 +0100)
struct pcmcia_socket lock had been used before.
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
drivers/pcmcia/vrc4171_card.c
patch
|
blob
|
history
diff --git
a/drivers/pcmcia/vrc4171_card.c
b/drivers/pcmcia/vrc4171_card.c
index
c9fcbdc
..
aaccdb9
100644
(file)
--- 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(&sock
et
->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(&sock
et
->lock);
return 0;
}