diff options
| author | Len Brown <len.brown@intel.com> | 2010-05-28 16:18:20 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-05-28 16:18:20 -0400 |
| commit | edbe77ba94217868caf5f391d2a083729bef3742 (patch) | |
| tree | 6525dc173ea0f94236b1ad01c1092b9f89d11d7a /drivers/acpi/video.c | |
| parent | 64a4222f7e087b5030eff0f6e47285696089d983 (diff) | |
| parent | 0dc698b93f3eecdda43b22232131324eb41e510c (diff) | |
Merge branch 'misc-2.6.35' into release
Diffstat (limited to 'drivers/acpi/video.c')
| -rw-r--r-- | drivers/acpi/video.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 4b8bda1154db..9865d46f49a8 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1003,11 +1003,11 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) result = acpi_video_init_brightness(device); if (result) return; - name = kzalloc(MAX_NAME_LEN, GFP_KERNEL); + name = kasprintf(GFP_KERNEL, "acpi_video%d", count); if (!name) return; + count++; - sprintf(name, "acpi_video%d", count++); memset(&props, 0, sizeof(struct backlight_properties)); props.max_brightness = device->brightness->count - 3; device->backlight = backlight_device_register(name, NULL, device, @@ -1063,10 +1063,10 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) if (device->cap._DCS && device->cap._DSS) { static int count; char *name; - name = kzalloc(MAX_NAME_LEN, GFP_KERNEL); + name = kasprintf(GFP_KERNEL, "acpi_video%d", count); if (!name) return; - sprintf(name, "acpi_video%d", count++); + count++; device->output_dev = video_output_register(name, NULL, device, &acpi_output_properties); kfree(name); |