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

Commit 8402641b authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

pcmcia: Fix requery 



The requery logic goes off and attempts to read the CIS of empty slots. In
most cases this happens not to do any harm - but not all!

Add the missing check and also a WARN() to catch any other offenders.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b38a4bd3

drivers/pcmcia/cistpl.c

+1 −1
Original line number Diff line number Diff line
@@ -1386,7 +1386,7 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *info) 
	if (!s)

		return -EINVAL;



	if (s->functions) {

	if (s->functions || !(s->state & SOCKET_PRESENT)) {

		WARN_ON(1);

		return -EINVAL;

	}

drivers/pcmcia/ds.c

+3 −0
Original line number Diff line number Diff line
@@ -667,6 +667,9 @@ static void pcmcia_requery(struct pcmcia_socket *s) 
{

	int has_pfc;



	if (!(s->state & SOCKET_PRESENT))

		return;



	if (s->functions == 0) {

		pcmcia_card_add(s);

		return;