Browse Source

Merge branch 'video-error-case' into release

Len Brown 15 years ago
parent
commit
cccc67a4cf
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/acpi/video.c

+ 3 - 1
drivers/acpi/video.c

@@ -999,8 +999,10 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 		sprintf(name, "acpi_video%d", count++);
 		device->backlight = backlight_device_register(name,
 			NULL, device, &acpi_backlight_ops);
-		device->backlight->props.max_brightness = device->brightness->count-3;
 		kfree(name);
+		if (IS_ERR(device->backlight))
+			return;
+		device->backlight->props.max_brightness = device->brightness->count-3;
 
 		result = sysfs_create_link(&device->backlight->dev.kobj,
 					   &device->dev->dev.kobj, "device");