| From stable-bounces@linux.kernel.org Tue Apr 4 09:14:25 2006 |
| Date: Tue, 4 Apr 2006 10:12:43 +0200 |
| From: Dominik Brodowski <linux@dominikbrodowski.net> |
| To: stable@kernel.org |
| Message-ID: <20060404081243.GA11755@dominikbrodowski.de> |
| Content-Disposition: inline |
| Cc: linux-pcmcia@lists.infradead.org |
| Subject: pcmcia: permit single-character-identifiers |
| |
| From: Janos Farkas <chexum@gmail.com> |
| |
| For some time, the core pcmcia drivers seem not to think single |
| character prod_ids are valid, thus preventing the "cleverly" named |
| |
| "D" "Link DWL-650 11Mbps WLAN Card" |
| |
| Before (as in 2.6.16): |
| PRODID_1="" |
| PRODID_2="Link DWL-650 11Mbps WLAN Card" |
| PRODID_3="Version 01.02" |
| PRODID_4="" |
| MANFID=0156,0002 |
| FUNCID=6 |
| |
| After (with the patch) |
| PRODID_1="D" |
| PRODID_2="Link DWL-650 11Mbps WLAN Card" |
| PRODID_3="Version 01.02" |
| PRODID_4="" |
| MANFID=0156,0002 |
| FUNCID=6 |
| |
| Signed-off-by: Janos Farkas <chexum@gmail.com> |
| Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/pcmcia/ds.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- linux-2.6.16.1.orig/drivers/pcmcia/ds.c |
| +++ linux-2.6.16.1/drivers/pcmcia/ds.c |
| @@ -546,7 +546,7 @@ static int pcmcia_device_query(struct pc |
| tmp = vers1->str + vers1->ofs[i]; |
| |
| length = strlen(tmp) + 1; |
| - if ((length < 3) || (length > 255)) |
| + if ((length < 2) || (length > 255)) |
| continue; |
| |
| p_dev->prod_id[i] = kmalloc(sizeof(char) * length, |
