From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Mon, 7 Jun 2010 16:31:17 +0000 (+0200)
Subject: pcmcia: avoid validate_cis failure on CIS override
X-Git-Tag: v2.6.35-rc3~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b83156b52dd77979cc93bafc2283929532f6f7d0;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed