applied to acpi-test >-----Original Message----- >From: akpm@xxxxxxxx [mailto:akpm@xxxxxxxx] >Sent: Saturday, June 24, 2006 7:37 PM >To: Brown, Len >Cc: linux-acpi@xxxxxxxxxxxxxxx; akpm@xxxxxxxx; Accardi, Kristen C >Subject: [patch 08/18] acpiphp: prevent duplicate slot numbers >when no _SUN > > >From: Kristen Accardi <kristen.c.accardi@xxxxxxxxx> > >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@xxxxxxxxx> >Signed-off-by: Andrew Morton <akpm@xxxxxxxx> >--- > > drivers/pci/hotplug/acpiphp_glue.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > >diff -puN >drivers/pci/hotplug/acpiphp_glue.c~acpiphp-prevent-duplicate-sl >ot-numbers-when-no-_sun drivers/pci/hotplug/acpiphp_glue.c >--- >devel/drivers/pci/hotplug/acpiphp_glue.c~acpiphp-prevent-duplic >ate-slot-numbers-when-no-_sun 2006-06-01 20:17:06.000000000 -0700 >+++ devel-akpm/drivers/pci/hotplug/acpiphp_glue.c >2006-06-01 20:17:06.000000000 -0700 >@@ -218,8 +218,13 @@ register_slot(acpi_handle handle, u32 lv > 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) >_ > - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
