[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100701174258.314043063@clark.site>
Date: Thu, 01 Jul 2010 10:43:51 -0700
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Dominik Brodowski <linux@...inikbrodowski.net>
Subject: [141/200] pcmcia: avoid validate_cis failure on CIS override
2.6.34-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dominik Brodowski <linux@...inikbrodowski.net>
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@...hat.com>
Signed-off-by: Dominik Brodowski <linux@...inikbrodowski.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
drivers/pcmcia/ds.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -682,6 +682,7 @@ static void pcmcia_requery(struct pcmcia
if (old_funcs != new_funcs) {
/* we need to re-start */
pcmcia_card_remove(s, NULL);
+ s->functions = 0;
pcmcia_card_add(s);
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists