summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanos Farkas <chexum@gmail.com>2006-03-31 01:04:57 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 16:59:29 +0200
commit6e3d4f25a561d15863ff4868a03780f59ba5ae8c (patch)
treea4b67cd3008ca87fe2ca4a50990adf0f3a21c24d
parenta0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff)
downloadop-kernel-dev-6e3d4f25a561d15863ff4868a03780f59ba5ae8c.zip
op-kernel-dev-6e3d4f25a561d15863ff4868a03780f59ba5ae8c.tar.gz
[PATCH] pcmcia: permit single-character identifiers
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>
-rw-r--r--drivers/pcmcia/ds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index bb96ce1..a4333a8 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -546,7 +546,7 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
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,
OpenPOWER on IntegriCloud