lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PNP: change pnp_add_card_id() to allocate its own pnp_id structures

Browse Source 
This moves some of the pnp_id knowledge out of the backends and into
the PNP core.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas
2008-04-28 16:33:56 -06:00
committed by Len Brown
parent 048825deea
commit e436675f2a
3 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/pnp/isapnp/core.c
View File

@@ -822,17 +822,18 @@ static unsigned char __init isapnp_checksum(unsigned char *data)
static void isapnp_parse_card_id(struct pnp_card *card, unsigned short vendor,
unsigned short device)
{
struct pnp_id *id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
char id[8];
if (!id)
return;
sprintf(id->id, "%c%c%c%x%x%x%x",
'A' + ((vendor >> 2) & 0x3f) - 1,
'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1,
'A' + ((vendor >> 8) & 0x1f) - 1,
(device >> 4) & 0x0f,
device & 0x0f, (device >> 12) & 0x0f, (device >> 8) & 0x0f);
pnp_add_card_id(id, card);
id[0] = 'A' + ((vendor >> 2) & 0x3f) - 1;
id[1] = 'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1;
id[2] = 'A' + ((vendor >> 8) & 0x1f) - 1;
id[3] = hex_asc((device >> 4) & 0x0f);
id[4] = hex_asc(device & 0x0f);
id[5] = hex_asc((device >> 12) & 0x0f);
id[6] = hex_asc((device >> 8) & 0x0f);
id[7] = '\0';
pnp_add_card_id(card, id);
}
/*