diff options
| author | Kristen Accardi <kristen.c.accardi@intel.com> | 2006-06-28 03:09:54 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-28 03:09:54 -0400 |
| commit | 95b38b3f453c16de0f8cddcde3e71050bbfb37b9 (patch) | |
| tree | 54893468b8335c88135ab01d580f0d1f87abf2f2 | |
| parent | 2b85e1307fe3a84eca2e1a21c6c857359908dab4 (diff) | |
| download | kernel_samsung_aries-95b38b3f453c16de0f8cddcde3e71050bbfb37b9.zip kernel_samsung_aries-95b38b3f453c16de0f8cddcde3e71050bbfb37b9.tar.gz kernel_samsung_aries-95b38b3f453c16de0f8cddcde3e71050bbfb37b9.tar.bz2 | |
ACPIPHP: prevent duplicate slot numbers when no _SUN
Dock bridges generally do not implement _SUN, yet show up as ejectable
slots. If you have more than one ejectable slot that does not implement
SUN, with the current code you will get duplicate slot numbers. So, if
there is no _SUN, use the current count of the number of slots found
instead.
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index b3899cf..ef95d12 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -219,8 +219,13 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) newfunc->flags |= FUNC_HAS_DCK; status = acpi_evaluate_integer(handle, "_SUN", NULL, &sun); - if (ACPI_FAILURE(status)) - sun = -1; + if (ACPI_FAILURE(status)) { + /* + * use the count of the number of slots we've found + * for the number of the slot + */ + sun = bridge->nr_slots+1; + } /* search for objects that share the same slot */ for (slot = bridge->slots; slot; slot = slot->next) |