Merge branch 'video-error-case' into release
This commit is contained in:
commit
cccc67a4cf
@ -999,8 +999,10 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
|
|||||||
sprintf(name, "acpi_video%d", count++);
|
sprintf(name, "acpi_video%d", count++);
|
||||||
device->backlight = backlight_device_register(name,
|
device->backlight = backlight_device_register(name,
|
||||||
NULL, device, &acpi_backlight_ops);
|
NULL, device, &acpi_backlight_ops);
|
||||||
device->backlight->props.max_brightness = device->brightness->count-3;
|
|
||||||
kfree(name);
|
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,
|
result = sysfs_create_link(&device->backlight->dev.kobj,
|
||||||
&device->dev->dev.kobj, "device");
|
&device->dev->dev.kobj, "device");
|
||||||
|
Loading…
Reference in New Issue
Block a user