diff options
| author | Janos Farkas <chexum@gmail.com> | 2006-03-30 18:04:57 -0500 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 09:59:29 -0500 |
| commit | 6e3d4f25a561d15863ff4868a03780f59ba5ae8c (patch) | |
| tree | a4b67cd3008ca87fe2ca4a50990adf0f3a21c24d /drivers | |
| parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) | |
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index bb96ce1db08..a4333a82669 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) | |||
| 546 | tmp = vers1->str + vers1->ofs[i]; | 546 | tmp = vers1->str + vers1->ofs[i]; |
| 547 | 547 | ||
| 548 | length = strlen(tmp) + 1; | 548 | length = strlen(tmp) + 1; |
| 549 | if ((length < 3) || (length > 255)) | 549 | if ((length < 2) || (length > 255)) |
| 550 | continue; | 550 | continue; |
| 551 | 551 | ||
| 552 | p_dev->prod_id[i] = kmalloc(sizeof(char) * length, | 552 | p_dev->prod_id[i] = kmalloc(sizeof(char) * length, |