From bfdf058c1b3610e93319457ae122bc0e9ce92b0f Mon Sep 17 00:00:00 2001 From: Chuck Ebbert Date: Tue, 15 Apr 2008 14:34:47 -0700 Subject: [PATCH] --- yaml --- r: 88355 b: refs/heads/master c: f0a37e008750ead1751b7d5e89d220a260a46147 h: refs/heads/master i: 88353: 815886321d1a342c1bf41b7ef0665bf10335c98c 88351: 977ea2fe4cb3461ccc75aeb71694f9327d1040e9 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/bus.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2811b235f203..d3ef1cd3a462 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1e7780638a9192f15caf590e0081bf915fdef71 +refs/heads/master: f0a37e008750ead1751b7d5e89d220a260a46147 diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c index 5b6760e0f957..2d1955c11833 100644 --- a/trunk/drivers/acpi/bus.c +++ b/trunk/drivers/acpi/bus.c @@ -373,10 +373,11 @@ int acpi_bus_receive_event(struct acpi_bus_event *event) } spin_lock_irqsave(&acpi_bus_event_lock, flags); - entry = - list_entry(acpi_bus_event_list.next, struct acpi_bus_event, node); - if (entry) + if (!list_empty(&acpi_bus_event_list)) { + entry = list_entry(acpi_bus_event_list.next, + struct acpi_bus_event, node); list_del(&entry->node); + } spin_unlock_irqrestore(&acpi_bus_event_lock, flags); if (!entry)