|
@@ -1687,10 +1687,6 @@ static int acpi_video_bus_add(struct acpi_device *device)
|
|
|
set_bit(KEY_BRIGHTNESS_ZERO, input->keybit);
|
|
|
set_bit(KEY_DISPLAY_OFF, input->keybit);
|
|
|
|
|
|
- error = input_register_device(input);
|
|
|
- if (error)
|
|
|
- goto err_stop_video;
|
|
|
-
|
|
|
printk(KERN_INFO PREFIX "%s [%s] (multi-head: %s rom: %s post: %s)\n",
|
|
|
ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
|
|
|
video->flags.multihead ? "yes" : "no",
|
|
@@ -1701,12 +1697,16 @@ static int acpi_video_bus_add(struct acpi_device *device)
|
|
|
video->pm_nb.priority = 0;
|
|
|
error = register_pm_notifier(&video->pm_nb);
|
|
|
if (error)
|
|
|
- goto err_unregister_input_dev;
|
|
|
+ goto err_stop_video;
|
|
|
+
|
|
|
+ error = input_register_device(input);
|
|
|
+ if (error)
|
|
|
+ goto err_unregister_pm_notifier;
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
- err_unregister_input_dev:
|
|
|
- input_unregister_device(input);
|
|
|
+ err_unregister_pm_notifier:
|
|
|
+ unregister_pm_notifier(&video->pm_nb);
|
|
|
err_stop_video:
|
|
|
acpi_video_bus_stop_devices(video);
|
|
|
err_free_input_dev:
|