aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Chiang <achiang@hp.com>2009-08-04 16:44:17 -0400
committerLen Brown <len.brown@intel.com>2009-08-31 13:35:38 -0400
commit7e24bc1ce669b2876ffa475ea1147f2bb9ffdc52 (patch)
tree0eea668d8904f701213bf9baecadf761a4edd352
parentadda766193ea1cf3137484a9521972d080d0b7af (diff)
ACPI: pci_slot.ko wants a 64-bit _SUN
Similar to commit b6adc195 (PCI hotplug: acpiphp wants a 64-bit _SUN), pci_slot.ko reads and creates sysfs directories based on the _SUN method. Certain HP platforms return 64 bits in _SUN. This change to pci_slot.ko allows us to see the correct sysfs directories. Reported-by: Chad Smith <chad.smith@hp.com> Cc: stable@kernel.org Signed-off-by: Alex Chiang <achiang@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/pci_slot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index 12158e0d009b..da9d6d25cf6d 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -57,7 +57,7 @@ ACPI_MODULE_NAME("pci_slot");
57 MY_NAME , ## arg); \ 57 MY_NAME , ## arg); \
58 } while (0) 58 } while (0)
59 59
60#define SLOT_NAME_SIZE 20 /* Inspired by #define in acpiphp.h */ 60#define SLOT_NAME_SIZE 21 /* Inspired by #define in acpiphp.h */
61 61
62struct acpi_pci_slot { 62struct acpi_pci_slot {
63 acpi_handle root_handle; /* handle of the root bridge */ 63 acpi_handle root_handle; /* handle of the root bridge */
@@ -149,7 +149,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
149 return AE_OK; 149 return AE_OK;
150 } 150 }
151 151
152 snprintf(name, sizeof(name), "%u", (u32)sun); 152 snprintf(name, sizeof(name), "%llu", sun);
153 pci_slot = pci_create_slot(pci_bus, device, name, NULL); 153 pci_slot = pci_create_slot(pci_bus, device, name, NULL);
154 if (IS_ERR(pci_slot)) { 154 if (IS_ERR(pci_slot)) {
155 err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot)); 155 err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot));