pcmcia: avoid validate_cis failure on CIS override
authorDominik Brodowski <linux@dominikbrodowski.net>
Mon, 7 Jun 2010 16:31:17 +0000 (18:31 +0200)
committerDominik Brodowski <linux@dominikbrodowski.net>
Mon, 7 Jun 2010 16:34:16 +0000 (18:34 +0200)
commitb83156b52dd77979cc93bafc2283929532f6f7d0
tree28c75d4bffb7fc30469999ad9884594ba017df8b
parent287b87a350de4e344d60697a1f16abe2a6cd350a
pcmcia: avoid validate_cis failure on CIS override

Commit a8408c17 introduced a new check to pccard_validate_cis(),
which avoids any "late" calls to this function. This broke the
insertion of cards which require a CIS override which changes
the number of card functions. Fix this by asserting that this
is _not_ a late call, but a proper call early during the card
insertion process.

Fixes https://bugzilla.kernel.org/show_bug.cgi?id=16138

Reported-by: Mikulas Patocka <mpatocka@redhat.com>
CC: <stable@kernel.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
drivers/pcmcia/ds.c