diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 12:58:21 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 12:58:21 +0200 |
| commit | 8e9914d5efe460600f5948da7ae4c1b6c038a4c0 (patch) | |
| tree | 2a6ed5d7ba447f2288f05f9b8d54db92b8b28139 /drivers/acpi/video.c | |
| parent | 80338681bbc5786fa1342d3b7f021c1d8974ac62 (diff) | |
| parent | 24071f472d813fccacc1ef7356b1f41422a1b968 (diff) | |
| download | linux-8e9914d5efe460600f5948da7ae4c1b6c038a4c0.tar.gz linux-8e9914d5efe460600f5948da7ae4c1b6c038a4c0.tar.bz2 linux-8e9914d5efe460600f5948da7ae4c1b6c038a4c0.zip | |
Merge branch 'acpi-scan'
* acpi-scan:
ACPI / scan: Do not bind ACPI drivers to objects with scan handlers
ACPI / ia64 / sba_iommu: Use ACPI scan handler for device discovery
ACPI / scan: Simplify ACPI driver probing
Diffstat (limited to 'drivers/acpi/video.c')
| -rw-r--r-- | drivers/acpi/video.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 440eadf2d32c..5d7075d25700 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1722,9 +1722,6 @@ static int acpi_video_bus_add(struct acpi_device *device) int error; acpi_status status; - if (device->handler) - return -EINVAL; - status = acpi_walk_namespace(ACPI_TYPE_DEVICE, device->parent->handle, 1, acpi_video_bus_match, NULL, |