summaryrefslogtreecommitdiff
path: root/drivers/acpi/device_sysfs.c
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2018-01-19 00:17:13 +0300
committerBob Peterson <rpeterso@redhat.com>2018-01-19 00:17:13 +0300
commit786ebd9f68cdf512f389e5f2d0015f1beb0777d8 (patch)
treeb4bae82884c2232f891aec11e58b38eb4fec5e5d /drivers/acpi/device_sysfs.c
parent1f23bc7869fffec40b8bd9333a74a18d1de54d98 (diff)
parent4e56a6411fbce6f859566e17298114c2434391a4 (diff)
downloadlinux-786ebd9f68cdf512f389e5f2d0015f1beb0777d8.tar.xz
Merge branch 'punch-hole' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
Diffstat (limited to 'drivers/acpi/device_sysfs.c')
-rw-r--r--drivers/acpi/device_sysfs.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/device_sysfs.c b/drivers/acpi/device_sysfs.c
index 24418932612e..a041689e5701 100644
--- a/drivers/acpi/device_sysfs.c
+++ b/drivers/acpi/device_sysfs.c
@@ -146,6 +146,10 @@ static int create_pnp_modalias(struct acpi_device *acpi_dev, char *modalias,
int count;
struct acpi_hardware_id *id;
+ /* Avoid unnecessarily loading modules for non present devices. */
+ if (!acpi_device_is_present(acpi_dev))
+ return 0;
+
/*
* Since we skip ACPI_DT_NAMESPACE_HID from the modalias below, 0 should
* be returned if ACPI_DT_NAMESPACE_HID is the only ACPI/PNP ID in the