lkml.org 
[lkml]   [2008]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/15] pnp: fix "add acpi:* modalias entries"
    Date
    From: Kay Sievers <kay.sievers@vrfy.org>

    With 22454cb99fc39f2629ad06a7eccb3df312f8830e we added only the
    first entry of the device table. We need to loop over the whole
    device list.

    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    scripts/mod/file2alias.c | 16 +++++++++++-----
    1 files changed, 11 insertions(+), 5 deletions(-)

    diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
    index 4fa1f3a..4c9890e 100644
    --- a/scripts/mod/file2alias.c
    +++ b/scripts/mod/file2alias.c
    @@ -344,14 +344,20 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
    struct module *mod)
    {
    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);

    - buf_printf(&mod->dev_table_buf,
    - "MODULE_ALIAS(\"pnp:d%s*\");\n", id->id);
    - buf_printf(&mod->dev_table_buf,
    - "MODULE_ALIAS(\"acpi*:%s:*\");\n", id->id);
    + for (i = 0; i < count; i++) {
    + const char *id = (char *)devs[i].id;
    +
    + buf_printf(&mod->dev_table_buf,
    + "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
    + buf_printf(&mod->dev_table_buf,
    + "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
    + }
    }

    /* looks like: "pnp:dD" for every device of the card */
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2008-08-21 19:45    [W:0.042 / U:1.576 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site