diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:20:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:20:36 -0400 |
| commit | 765426e8ee4c0ab2bc9d44951f4865b8494cdbd0 (patch) | |
| tree | 2b46ab8953eff175c8d3474a9754c1ab1394e4de /drivers/acpi/cm_sbs.c | |
| parent | 36ec891895020f3bc9953c8b11d079c6d77d76bd (diff) | |
| parent | 898b054f3eec5921320ae8614b5bdd7b07ea5b43 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (123 commits)
dock: make dock driver not a module
ACPI: fix ia64 build warning
ACPI: hack around sysfs warning with link order
ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n
intel_menlo: fix build warning
panasonic-laptop: fix build
ACPICA: Update version to 20080926
ACPICA: Add support for zero-length buffer-to-string conversions
ACPICA: New: Validation for predefined ACPI methods/objects
ACPICA: Fix for implicit return compatibility
ACPICA: Fixed a couple memory leaks associated with "implicit return"
ACPICA: Optimize buffer allocation procedure
ACPICA: Fix possible memory leak, error exit path
ACPICA: Fix fault after mem allocation failure in AML parser
ACPICA: Remove unused ACPI register bit definition
ACPICA: Update version to 20080829
ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname
ACPICA: Cleanup for internal Reference Object
ACPICA: Update comments - no functional changes
ACPICA: Update for Reference ACPI_OPERAND_OBJECT
...
Diffstat (limited to 'drivers/acpi/cm_sbs.c')
| -rw-r--r-- | drivers/acpi/cm_sbs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/cm_sbs.c b/drivers/acpi/cm_sbs.c index f9db4f444bd0..4441e84b28a9 100644 --- a/drivers/acpi/cm_sbs.c +++ b/drivers/acpi/cm_sbs.c | |||
| @@ -52,8 +52,8 @@ struct proc_dir_entry *acpi_lock_ac_dir(void) | |||
| 52 | if (acpi_ac_dir) { | 52 | if (acpi_ac_dir) { |
| 53 | lock_ac_dir_cnt++; | 53 | lock_ac_dir_cnt++; |
| 54 | } else { | 54 | } else { |
| 55 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 55 | printk(KERN_ERR PREFIX |
| 56 | "Cannot create %s\n", ACPI_AC_CLASS)); | 56 | "Cannot create %s\n", ACPI_AC_CLASS); |
| 57 | } | 57 | } |
| 58 | mutex_unlock(&cm_sbs_mutex); | 58 | mutex_unlock(&cm_sbs_mutex); |
| 59 | return acpi_ac_dir; | 59 | return acpi_ac_dir; |
| @@ -83,8 +83,8 @@ struct proc_dir_entry *acpi_lock_battery_dir(void) | |||
| 83 | if (acpi_battery_dir) { | 83 | if (acpi_battery_dir) { |
| 84 | lock_battery_dir_cnt++; | 84 | lock_battery_dir_cnt++; |
| 85 | } else { | 85 | } else { |
| 86 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 86 | printk(KERN_ERR PREFIX |
| 87 | "Cannot create %s\n", ACPI_BATTERY_CLASS)); | 87 | "Cannot create %s\n", ACPI_BATTERY_CLASS); |
| 88 | } | 88 | } |
| 89 | mutex_unlock(&cm_sbs_mutex); | 89 | mutex_unlock(&cm_sbs_mutex); |
| 90 | return acpi_battery_dir; | 90 | return acpi_battery_dir; |