lkml.org 
[lkml]   [2008]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 21/45] USB: handle idVendor of 0x0000
    2.6.24-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Greg Kroah-Hartman <gregkh@suse.de>

    Some crazy devices in the wild have a vendor id of 0x0000. If we try to
    add a module alias with this id, we just can't do it due to a check in
    the file2alias.c file. Change the test to verify that both the vendor
    and product ids are 0x0000 to show a real "blank" module alias.

    Note, the module-init-tools package also needs to be changed to properly
    generate the depmod tables.

    Cc: Janusz <janumix@poczta.fm>
    Cc: Jon Masters <jcm@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/usb/core/driver.c | 4 ++--
    scripts/mod/file2alias.c | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/usb/core/driver.c
    +++ b/drivers/usb/core/driver.c
    @@ -534,8 +534,8 @@ const struct usb_device_id *usb_match_id
    id->driver_info is the way to create an entry that
    indicates that the driver want to examine every
    device and interface. */
    - for (; id->idVendor || id->bDeviceClass || id->bInterfaceClass ||
    - id->driver_info; id++) {
    + for (; id->idVendor || id->idProduct || id->bDeviceClass ||
    + id->bInterfaceClass || id->driver_info; id++) {
    if (usb_match_one_id(interface, id))
    return id;
    }
    --- a/scripts/mod/file2alias.c
    +++ b/scripts/mod/file2alias.c
    @@ -155,7 +155,7 @@ static void do_usb_entry_multi(struct us
    * Some modules (visor) have empty slots as placeholder for
    * run-time specification that results in catch-all alias
    */
    - if (!(id->idVendor | id->bDeviceClass | id->bInterfaceClass))
    + if (!(id->idVendor | id->idProduct | id->bDeviceClass | id->bInterfaceClass))
    return;

    /* Convert numeric bcdDevice range into fnmatch-able pattern(s) */
    --


    \
     
     \ /
      Last update: 2008-02-07 22:03    [W:0.022 / U:4.300 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site