Skip to content

Commit

Permalink
[PATCH] pcmcia: permit single-character identifiers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Janos Farkas authored and Dominik Brodowski committed Mar 31, 2006
1 parent a0f0678 commit 6e3d4f2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pcmcia/ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 6e3d4f2

Please sign in to comment.