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

Commit d250a481 authored by Daniel Ritz's avatar Daniel Ritz Committed by Dominik Brodowski
Browse files

[PATCH] yenta: do power-up only after socket is configured 



Power-up the card only after the socket is configured. power-down in
the old place. The point is not to power-up the card before the interrupt
routing is set up correctly.

Signed-off-by: default avatarDaniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 598736c5

drivers/pcmcia/yenta_socket.c

+8 −1
Original line number Diff line number Diff line
@@ -287,7 +287,10 @@ static int yenta_set_socket(struct pcmcia_socket *sock, socket_state_t *state) 
	struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket);

	u16 bridge;



	/* if powering down: do it immediately */

	if (state->Vcc == 0)

		yenta_set_power(socket, state);



	socket->io_irq = state->io_irq;

	bridge = config_readw(socket, CB_BRIDGE_CONTROL) & ~(CB_BRIDGE_CRST | CB_BRIDGE_INTR);

	if (cb_readl(socket, CB_SOCKET_STATE) & CB_CBCARD) {
@@ -339,6 +342,10 @@ static int yenta_set_socket(struct pcmcia_socket *sock, socket_state_t *state) 
	/* Socket event mask: get card insert/remove events.. */

	cb_writel(socket, CB_SOCKET_EVENT, -1);

	cb_writel(socket, CB_SOCKET_MASK, CB_CDMASK);



	/* if powering up: do it as the last step when the socket is configured */

	if (state->Vcc != 0)

		yenta_set_power(socket, state);

	return 0;

}