Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 165294
b: refs/heads/master
c: 59fc9e5
h: refs/heads/master
v: v3
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Sep 19, 2009
1 parent 77b759d commit 83590a2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9ac6185669d0d277c4082fa92ba8eb2e55534cbf
refs/heads/master: 59fc9e5e21baf2bf5c87d8006e006007c3a708c2
9 changes: 0 additions & 9 deletions trunk/drivers/acpi/osl.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,18 +699,12 @@ void acpi_os_derive_pci_id(acpi_handle rhandle, /* upper bound */
static void acpi_os_execute_deferred(struct work_struct *work)
{
struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
if (!dpc) {
printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
return;
}

if (dpc->wait)
acpi_os_wait_events_complete(NULL);

dpc->function(dpc->context);
kfree(dpc);

return;
}

/*******************************************************************************
Expand Down Expand Up @@ -739,9 +733,6 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
"Scheduling function [%p(%p)] for deferred execution.\n",
function, context));

if (!function)
return AE_BAD_PARAMETER;

/*
* Allocate/initialize DPC structure. Note that this memory will be
* freed by the callee. The kernel handles the work_struct list in a
Expand Down

0 comments on commit 83590a2

Please sign in to comment.