Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 376802
b: refs/heads/master
c: ea7f665
h: refs/heads/master
v: v3
  • Loading branch information
Rafael J. Wysocki authored and Linus Torvalds committed Jun 8, 2013
1 parent 9516a2f commit b060886
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 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: e8193ce572f0ddb8004acf976bba119f0abbe6ca
refs/heads/master: ea7f665612fcc73da6b7698f468cd5fc03a30d47
4 changes: 0 additions & 4 deletions trunk/drivers/acpi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -740,10 +740,6 @@ static int acpi_bus_match(struct device *dev, struct device_driver *drv)
struct acpi_device *acpi_dev = to_acpi_device(dev);
struct acpi_driver *acpi_drv = to_acpi_driver(drv);

/* Skip ACPI device objects with scan handlers attached. */
if (acpi_dev->handler)
return 0;

return acpi_dev->flags.match_driver
&& !acpi_match_device_ids(acpi_dev, acpi_drv->ids);
}
Expand Down

0 comments on commit b060886

Please sign in to comment.