diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
commit | b05005772f34497eb2b7415a651fe785cbe70e16 (patch) | |
tree | b176aeb7fa9baf69e77ddd83e844727490bfcf28 /drivers/acpi/namespace/nseval.c | |
parent | 044f324f6ea5d55391db62fca6a295b2651cb946 (diff) | |
parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
Diffstat (limited to 'drivers/acpi/namespace/nseval.c')
-rw-r--r-- | drivers/acpi/namespace/nseval.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c index 0191c7d92824..19d7b94d40c3 100644 --- a/drivers/acpi/namespace/nseval.c +++ b/drivers/acpi/namespace/nseval.c | |||
@@ -6,7 +6,7 @@ | |||
6 | ******************************************************************************/ | 6 | ******************************************************************************/ |
7 | 7 | ||
8 | /* | 8 | /* |
9 | * Copyright (C) 2000 - 2005, R. Byron Moore | 9 | * Copyright (C) 2000 - 2006, R. Byron Moore |
10 | * All rights reserved. | 10 | * All rights reserved. |
11 | * | 11 | * |
12 | * Redistribution and use in source and binary forms, with or without | 12 | * Redistribution and use in source and binary forms, with or without |
@@ -373,8 +373,7 @@ acpi_ns_execute_control_method(struct acpi_parameter_info *info) | |||
373 | 373 | ||
374 | info->obj_desc = acpi_ns_get_attached_object(info->node); | 374 | info->obj_desc = acpi_ns_get_attached_object(info->node); |
375 | if (!info->obj_desc) { | 375 | if (!info->obj_desc) { |
376 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 376 | ACPI_ERROR((AE_INFO, "No attached method object")); |
377 | "No attached method object\n")); | ||
378 | 377 | ||
379 | (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); | 378 | (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); |
380 | return_ACPI_STATUS(AE_NULL_OBJECT); | 379 | return_ACPI_STATUS(AE_NULL_OBJECT); |