Commit 6e3d4f25 authored Mar 31, 2006 by Janos Farkas Committed by Dominik Brodowski Mar 31, 2006

[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>

parent a0f06780

drivers/pcmcia/ds.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,

Admin message