diff options
| author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-07-13 10:45:00 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-13 10:45:00 +0200 |
| commit | 1b3035b7fcc72b6b36f2a3634dad832eb2453ce8 (patch) | |
| tree | 728174d72943cc9b981a5843553551df62eddc41 /drivers/acpi/parser/pswalk.c | |
| parent | a98a5d04f400ad112e59cadd739dbabf89417e60 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
| download | kernel_samsung_smdk4412-1b3035b7fcc72b6b36f2a3634dad832eb2453ce8.zip kernel_samsung_smdk4412-1b3035b7fcc72b6b36f2a3634dad832eb2453ce8.tar.gz kernel_samsung_smdk4412-1b3035b7fcc72b6b36f2a3634dad832eb2453ce8.tar.bz2 | |
Merge with rsync://fileserver/linux
Diffstat (limited to 'drivers/acpi/parser/pswalk.c')
| -rw-r--r-- | drivers/acpi/parser/pswalk.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/acpi/parser/pswalk.c b/drivers/acpi/parser/pswalk.c index 110d2ce..9d20cb2 100644 --- a/drivers/acpi/parser/pswalk.c +++ b/drivers/acpi/parser/pswalk.c @@ -90,17 +90,15 @@ acpi_ps_delete_parse_tree ( } } - /* - * No more children, this Op is complete. - */ + /* No more children, this Op is complete. */ + next = op->common.next; parent = op->common.parent; acpi_ps_free_op (op); - /* - * If we are back to the starting point, the walk is complete. - */ + /* If we are back to the starting point, the walk is complete. */ + if (op == subtree_root) { return_VOID; } @@ -111,5 +109,6 @@ acpi_ps_delete_parse_tree ( op = parent; } } + return_VOID; } |