lkml.org 
[lkml]   [2013]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 209/222] ACPI / scan: Do not use dummy HID for system bus ACPI nodes
    Date
    3.5.7.3 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>

    commit 4f5f64cf0cc916220aaa055992e31195470cfe37 upstream.

    At one point acpi_device_set_id() checks if acpi_device_hid(device)
    returns NULL, but that never happens, so system bus devices with an
    empty list of PNP IDs are given the dummy HID ("device") instead of
    the "system bus HID" ("LNXSYBUS"). Fix the code to use the right
    check.

    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    drivers/acpi/scan.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
    index 803c4ec..fcae116 100644
    --- a/drivers/acpi/scan.c
    +++ b/drivers/acpi/scan.c
    @@ -1162,7 +1162,7 @@ static void acpi_device_set_id(struct acpi_device *device)
    acpi_add_id(device, ACPI_DOCK_HID);
    else if (!acpi_ibm_smbus_match(device))
    acpi_add_id(device, ACPI_SMBUS_IBM_HID);
    - else if (!acpi_device_hid(device) &&
    + else if (list_empty(&device->pnp.ids) &&
    ACPI_IS_ROOT_DEVICE(device->parent)) {
    acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
    strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-01-16 18:22    [W:4.089 / U:0.564 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site