Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 166373
b: refs/heads/master
c: 29aaefa
h: refs/heads/master
i:
  166371: c892630
v: v3
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Sep 25, 2009
1 parent 4c5087b commit cdf392c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b24715027aab5e586c4ab1d035f3e543307dea69
refs/heads/master: 29aaefa68f933110e577fbf3ca360c88331e5ff5
12 changes: 10 additions & 2 deletions trunk/drivers/acpi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -1230,6 +1230,7 @@ acpi_add_single_object(struct acpi_device **child,
{
int result = 0;
struct acpi_device *device = NULL;
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };


if (!child)
Expand Down Expand Up @@ -1355,9 +1356,16 @@ acpi_add_single_object(struct acpi_device **child,
}

end:
if (!result)
if (!result) {
acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Adding %s [%s] parent %s\n", dev_name(&device->dev),
(char *) buffer.pointer,
device->parent ? dev_name(&device->parent->dev) :
"(null)"));
kfree(buffer.pointer);
*child = device;
else
} else
acpi_device_release(&device->dev);

return result;
Expand Down

0 comments on commit cdf392c

Please sign in to comment.