Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a410e8d authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Dominik Brodowski
Browse files

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



struct pcmcia_socket lock had been used before.

Signed-off-by: default avatarYoichi Yuasa <yuasa@linux-mips.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent a3d3203e

drivers/pcmcia/vrc4171_card.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

}