diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 15:40:39 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:40:39 -0400 |
| commit | 36a557d1f48669c57f59e37d9334400a29e4e53c (patch) | |
| tree | 6d97b3eb9fefa6a82dd11dd7caeb799f986bdc48 | |
| parent | 4e8f10b7ccf1c3c53a818a157962074a7340732e (diff) | |
| parent | 6665bda76461308868bd1e52caf627f4cb29ed32 (diff) | |
| download | kernel_samsung_smdk4412-36a557d1f48669c57f59e37d9334400a29e4e53c.zip kernel_samsung_smdk4412-36a557d1f48669c57f59e37d9334400a29e4e53c.tar.gz kernel_samsung_smdk4412-36a557d1f48669c57f59e37d9334400a29e4e53c.tar.bz2 | |
Pull trivial into release branch
| -rw-r--r-- | Documentation/kernel-parameters.txt | 3 | ||||
| -rw-r--r-- | drivers/acpi/hotkey.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/thermal.c | 4 | ||||
| -rw-r--r-- | drivers/acpi/video.c | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index b3a6187..a853e86 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -147,6 +147,9 @@ running once the system is up. acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA Format: <irq>,<irq>... + acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS + Format: To spoof as Windows 98: ="Microsoft Windows" + acpi_osi= [HW,ACPI] empty param disables _OSI acpi_serialize [HW,ACPI] force serialization of AML methods diff --git a/drivers/acpi/hotkey.c b/drivers/acpi/hotkey.c index 2e2e4051..c25b2b9 100644 --- a/drivers/acpi/hotkey.c +++ b/drivers/acpi/hotkey.c @@ -723,6 +723,8 @@ get_parms(char *config_record, goto do_fail; count = tmp1 - tmp; *action_handle = (char *)kmalloc(count + 1, GFP_KERNEL); + if (!*action_handle) + goto do_fail; strncpy(*action_handle, tmp, count); *(*action_handle + count) = 0; diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index fba9c23..a29af58 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -941,8 +941,10 @@ acpi_thermal_write_trip_points(struct file *file, memset(limit_string, 0, ACPI_THERMAL_MAX_LIMIT_STR_LEN); active = kmalloc(ACPI_THERMAL_MAX_ACTIVE * sizeof(int), GFP_KERNEL); - if (!active) + if (!active) { + kfree(limit_string); return_VALUE(-ENOMEM); + } if (!tz || (count > ACPI_THERMAL_MAX_LIMIT_STR_LEN - 1)) { ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid argument\n")); diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index bd48875..724149d 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -323,7 +323,7 @@ acpi_video_device_lcd_query_levels(struct acpi_video_device *device, if (!ACPI_SUCCESS(status)) return_VALUE(status); obj = (union acpi_object *)buffer.pointer; - if (!obj && (obj->type != ACPI_TYPE_PACKAGE)) { + if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) { ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _BCL data\n")); status = -EFAULT; goto err; |