Re: [PATCH] PCI and PCI Hotplug update for 2.6.6-rc1

Greg KH
2004-04-15T17:32:08Z

ChangeSet 1.1692.3.4, 2004/03/26 16:32:21-08:00, willy@debian.org

[PATCH] PCI Hotplug: Don't up() twice in acpiphp

On the error path, we currently try to up() a semaphore twice.
There was also a typo in an error message.

drivers/pci/hotplug/acpiphp_glue.c | 38 +++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)

diff -Nru a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
--- a/drivers/pci/hotplug/acpiphp_glue.c Thu Apr 15 10:05:56 2004
+++ b/drivers/pci/hotplug/acpiphp_glue.c Thu Apr 15 10:05:56 2004
@@ -1243,40 +1243,38 @@

/**
* acpiphp_check_bridge - re-enumerate devices
+ *
+ * Iterate over all slots under this bridge and make sure that if a
+ * card is present they are enabled, and if not they are disabled.
*/
int acpiphp_check_bridge(struct acpiphp_bridge *bridge)
{
struct acpiphp_slot *slot;
- unsigned int sta;
int retval = 0;
int enabled, disabled;

enabled = disabled = 0;

for (slot = bridge->slots; slot; slot = slot->next) {
- sta = get_slot_status(slot);
+ unsigned int status = get_slot_status(slot);
if (slot->flags & SLOT_ENABLED) {
- /* if enabled but not present, disable */
- if (sta != ACPI_STA_ALL) {
- retval = acpiphp_disable_slot(slot);
- if (retval) {
- err("Error occurred in enabling\n");
- up(&slot->crit_sect);
- goto err_exit;
- }
- disabled++;
+ if (status == ACPI_STA_ALL)
+ continue;
+ retval = acpiphp_disable_slot(slot);
+ if (retval) {
+ err("Error occurred in disabling\n");
+ goto err_exit;
}
+ disabled++;
} else {
- /* if disabled but present, enable */
- if (sta == ACPI_STA_ALL) {
- retval = acpiphp_enable_slot(slot);
- if (retval) {
- err("Error occurred in enabling\n");
- up(&slot->crit_sect);
- goto err_exit;
- }
- enabled++;
+ if (status != ACPI_STA_ALL)
+ continue;
+ retval = acpiphp_enable_slot(slot);
+ if (retval) {
+ err("Error occurred in enabling\n");
+ goto err_exit;
}
+ enabled++;
}
}