← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/acpi/acpica/psxface.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/acpi/acpica/psxface.c
5
5
 *****************************************************************************/
6
6
 
7
7
/*
8
 
 * Copyright (C) 2000 - 2008, Intel Corp.
 
8
 * Copyright (C) 2000 - 2011, Intel Corp.
9
9
 * All rights reserved.
10
10
 *
11
11
 * Redistribution and use in source and binary forms, with or without
46
46
#include "acparser.h"
47
47
#include "acdispat.h"
48
48
#include "acinterp.h"
49
 
#include "amlcode.h"
 
49
#include "actables.h"
50
50
 
51
51
#define _COMPONENT          ACPI_PARSER
52
52
ACPI_MODULE_NAME("psxface")
220
220
 
221
221
        ACPI_FUNCTION_TRACE(ps_execute_method);
222
222
 
 
223
        /* Quick validation of DSDT header */
 
224
 
 
225
        acpi_tb_check_dsdt_header();
 
226
 
223
227
        /* Validate the Info and method Node */
224
228
 
225
229
        if (!info || !info->resolved_node) {
280
284
                goto cleanup;
281
285
        }
282
286
 
283
 
        if (info->obj_desc->method.flags & AOPOBJ_MODULE_LEVEL) {
 
287
        if (info->obj_desc->method.info_flags & ACPI_METHOD_MODULE_LEVEL) {
284
288
                walk_state->parse_flags |= ACPI_PARSE_MODULE_LEVEL;
285
289
        }
286
290
 
287
291
        /* Invoke an internal method if necessary */
288
292
 
289
 
        if (info->obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
290
 
                status = info->obj_desc->method.implementation(walk_state);
 
293
        if (info->obj_desc->method.info_flags & ACPI_METHOD_INTERNAL_ONLY) {
 
294
                status =
 
295
                    info->obj_desc->method.dispatch.implementation(walk_state);
291
296
                info->return_object = walk_state->return_desc;
292
297
 
293
298
                /* Cleanup states */
306
311
         */
307
312
        if (acpi_gbl_enable_interpreter_slack) {
308
313
                walk_state->implicit_return_obj =
309
 
                    acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
 
314
                    acpi_ut_create_integer_object((u64) 0);
310
315
                if (!walk_state->implicit_return_obj) {
311
316
                        status = AE_NO_MEMORY;
312
317
                        acpi_ds_delete_walk_state(walk_state);
313
318
                        goto cleanup;
314
319
                }
315
 
 
316
 
                walk_state->implicit_return_obj->integer.value = 0;
317
320
        }
318
321
 
319
322
        /* Parse the AML */