]> git.karo-electronics.de Git - karo-tx-linux.git/commit
pcmcia: avoid validate_cis failure on CIS override
authorDominik Brodowski <linux@dominikbrodowski.net>
Mon, 7 Jun 2010 16:31:17 +0000 (18:31 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 5 Jul 2010 18:22:44 +0000 (11:22 -0700)
commitcd495841c53fe3ac04578c0711339282bec90ed6
treed6fcb175d682ffc0026af92de312786a485be7b6
parent91d5e7b11a032cb392bf6332acc23e7e2f0679f3
pcmcia: avoid validate_cis failure on CIS override

commit b83156b52dd77979cc93bafc2283929532f6f7d0 upstream.

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>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/pcmcia/ds.c