aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/isapnp
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pnp/isapnp')
-rw-r--r--drivers/pnp/isapnp/core.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 727936a6befb..1949c18a7365 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -822,17 +822,18 @@ static unsigned char __init isapnp_checksum(unsigned char *data)
822static void isapnp_parse_card_id(struct pnp_card *card, unsigned short vendor, 822static void isapnp_parse_card_id(struct pnp_card *card, unsigned short vendor,
823 unsigned short device) 823 unsigned short device)
824{ 824{
825 struct pnp_id *id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL); 825 char id[8];
826 826
827 if (!id) 827 id[0] = 'A' + ((vendor >> 2) & 0x3f) - 1;
828 return; 828 id[1] = 'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1;
829 sprintf(id->id, "%c%c%c%x%x%x%x", 829 id[2] = 'A' + ((vendor >> 8) & 0x1f) - 1;
830 'A' + ((vendor >> 2) & 0x3f) - 1, 830 id[3] = hex_asc((device >> 4) & 0x0f);
831 'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1, 831 id[4] = hex_asc(device & 0x0f);
832 'A' + ((vendor >> 8) & 0x1f) - 1, 832 id[5] = hex_asc((device >> 12) & 0x0f);
833 (device >> 4) & 0x0f, 833 id[6] = hex_asc((device >> 8) & 0x0f);
834 device & 0x0f, (device >> 12) & 0x0f, (device >> 8) & 0x0f); 834 id[7] = '\0';
835 pnp_add_card_id(id, card); 835
836 pnp_add_card_id(card, id);
836} 837}
837 838
838/* 839/*