* [Resend][PATCH] PCI / Hotplug: Fix unexpected driver unregister in pciehp_acpi.c
@ 2010-12-18 12:29 Rafael J. Wysocki
2010-12-20 0:30 ` Kenji Kaneshige
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2010-12-18 12:29 UTC (permalink / raw
To: Jesse Barnes; +Cc: LKML, linux-pci, ACPI Devel Maling List, Matthew Garrett
From: Rafael J. Wysocki <rjw@sisk.pl>
If pcie_ports_disabled is set, pcie_port_service_register() returns
error code and select_detection_mode() should not attempt to
unregister dummy_driver and use dummy_slots. It should return
PCIEHP_DETECT_ACPI immediately instead.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
Hi Jesse,
I'm not sure if you've got this patch. It fixes a problem introduced in the
2.6.37 merge window, so I guess it should be merged before 2.6.37 final.
Details in https://bugzilla.kernel.org/show_bug.cgi?id=20232#c23 .
Thanks,
Rafael
---
drivers/pci/hotplug/pciehp_acpi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: linux-2.6/drivers/pci/hotplug/pciehp_acpi.c
===================================================================
--- linux-2.6.orig/drivers/pci/hotplug/pciehp_acpi.c
+++ linux-2.6/drivers/pci/hotplug/pciehp_acpi.c
@@ -115,7 +115,8 @@ static struct pcie_port_service_driver _
static int __init select_detection_mode(void)
{
struct dummy_slot *slot, *tmp;
- pcie_port_service_register(&dummy_driver);
+ if (pcie_port_service_register(&dummy_driver))
+ return PCIEHP_DETECT_ACPI;
pcie_port_service_unregister(&dummy_driver);
list_for_each_entry_safe(slot, tmp, &dummy_slots, list) {
list_del(&slot->list);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Resend][PATCH] PCI / Hotplug: Fix unexpected driver unregister in pciehp_acpi.c
2010-12-18 12:29 [Resend][PATCH] PCI / Hotplug: Fix unexpected driver unregister in pciehp_acpi.c Rafael J. Wysocki
@ 2010-12-20 0:30 ` Kenji Kaneshige
2010-12-23 20:52 ` Jesse Barnes
0 siblings, 1 reply; 3+ messages in thread
From: Kenji Kaneshige @ 2010-12-20 0:30 UTC (permalink / raw
To: Rafael J. Wysocki, Jesse Barnes
Cc: LKML, linux-pci, ACPI Devel Maling List, Matthew Garrett
(2010/12/18 21:29), Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki<rjw@sisk.pl>
>
> If pcie_ports_disabled is set, pcie_port_service_register() returns
> error code and select_detection_mode() should not attempt to
> unregister dummy_driver and use dummy_slots. It should return
> PCIEHP_DETECT_ACPI immediately instead.
>
> Signed-off-by: Rafael J. Wysocki<rjw@sisk.pl>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Resend][PATCH] PCI / Hotplug: Fix unexpected driver unregister in pciehp_acpi.c
2010-12-20 0:30 ` Kenji Kaneshige
@ 2010-12-23 20:52 ` Jesse Barnes
0 siblings, 0 replies; 3+ messages in thread
From: Jesse Barnes @ 2010-12-23 20:52 UTC (permalink / raw
To: Kenji Kaneshige
Cc: Rafael J. Wysocki, LKML, linux-pci, ACPI Devel Maling List,
Matthew Garrett
On Mon, 20 Dec 2010 09:30:04 +0900
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> wrote:
> (2010/12/18 21:29), Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki<rjw@sisk.pl>
> >
> > If pcie_ports_disabled is set, pcie_port_service_register() returns
> > error code and select_detection_mode() should not attempt to
> > unregister dummy_driver and use dummy_slots. It should return
> > PCIEHP_DETECT_ACPI immediately instead.
> >
> > Signed-off-by: Rafael J. Wysocki<rjw@sisk.pl>
>
> Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
> Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
>
>
Applied to my for-linus branch, thanks guys.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-12-23 20:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-18 12:29 [Resend][PATCH] PCI / Hotplug: Fix unexpected driver unregister in pciehp_acpi.c Rafael J. Wysocki
2010-12-20 0:30 ` Kenji Kaneshige
2010-12-23 20:52 ` Jesse Barnes
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.