Commit 5e4c6564 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman

pnp: fix "add acpi:* modalias entries"

With 22454cb9 we added only the
first entry of the device table. We need to loop over the whole
device list.
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c767db0a
...@@ -344,14 +344,20 @@ static void do_pnp_device_entry(void *symval, unsigned long size, ...@@ -344,14 +344,20 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
struct module *mod) struct module *mod)
{ {
const unsigned long id_size = sizeof(struct pnp_device_id); const unsigned long id_size = sizeof(struct pnp_device_id);
const struct pnp_device_id *id = symval; const unsigned int count = (size / id_size)-1;
const struct pnp_device_id *devs = symval;
unsigned int i;
device_id_check(mod->name, "pnp", size, id_size, symval); device_id_check(mod->name, "pnp", size, id_size, symval);
for (i = 0; i < count; i++) {
const char *id = (char *)devs[i].id;
buf_printf(&mod->dev_table_buf, buf_printf(&mod->dev_table_buf,
"MODULE_ALIAS(\"pnp:d%s*\");\n", id->id); "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
buf_printf(&mod->dev_table_buf, buf_printf(&mod->dev_table_buf,
"MODULE_ALIAS(\"acpi*:%s:*\");\n", id->id); "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
}
} }
/* looks like: "pnp:dD" for every device of the card */ /* looks like: "pnp:dD" for every device of the card */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment