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

Commit 1c6c9b1d authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

pcmcia: handle anonymous cards by generating a fake CIS 



The core pcmcia code blows up all over the place if it allowed a card without
a valid CIS. We need to allow such cards as the CIS stuff is not on the older
flash, ROM and SRAM cards.

In order to minimise the risk of misidentifying junk and feeding it to the
wrong thing we only fix up apparently anonymous cards if the driver for them
has been enabled.

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

drivers/pcmcia/cistpl.c

+20 −4
Original line number Diff line number Diff line
@@ -1451,11 +1451,27 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *info) 
done:

	/* invalidate CIS cache on failure */

	if (!dev_ok || !ident_ok || !count) {

#if defined(CONFIG_MTD_PCMCIA_ANONYMOUS)

		/* Set up as an anonymous card. If we don't have anonymous

		   memory support then just error the card as there is no

		   point trying to second guess.



		   Note: some cards have just a device entry, it may be

		   worth extending support to cover these in future */

		if (!dev_ok || !ident_ok) {

			dev_info(&s->dev, "no CIS, assuming an anonymous memory card.\n");

			pcmcia_replace_cis(s, "\xFF", 1);

			count = 1;

			ret = 0;

		} else

#endif

		{

			mutex_lock(&s->ops_mutex);

			destroy_cis_cache(s);

			mutex_unlock(&s->ops_mutex);

			ret = -EIO;

		}

	}



	if (info)

		*info = count;