diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 07:04:27 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 07:04:27 +0100 |
| commit | cece901481bafbf14de8cbd3a89ae869ea881055 (patch) | |
| tree | f9e240443643008c8feeaf55919105dc63ab8c72 /drivers/acpi/osl.c | |
| parent | Pull bugfix into test branch (diff) | |
| parent | ACPI: Remove unnecessary from/to-void* and to-void casts in drivers/acpi (diff) | |
| download | linux-cece901481bafbf14de8cbd3a89ae869ea881055.tar.xz linux-cece901481bafbf14de8cbd3a89ae869ea881055.zip | |
Pull style into test branch
Conflicts:
drivers/acpi/button.c
drivers/acpi/ec.c
drivers/acpi/osl.c
drivers/acpi/sbs.c
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 02b30ae6a68e..b7ca020a0565 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -568,6 +568,7 @@ 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; @@ -1051,7 +1052,7 @@ acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache) acpi_status acpi_os_purge_cache(acpi_cache_t * cache) { - (void)kmem_cache_shrink(cache); + kmem_cache_shrink(cache); return (AE_OK); } |