Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca3c2c70 authored by Mattia Dongili's avatar Mattia Dongili Committed by Matthew Garrett
Browse files

sony-laptop: input initialization should be done before SNC 



SNC needs input devices so better have those ready before starting
handle events.

Signed-off-by: default avatarMattia Dongili <malattia@linux.it>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 014fc8fb

drivers/platform/x86/sony-laptop.c

+12 −13
Original line number Diff line number Diff line
@@ -2642,6 +2642,12 @@ static int sony_nc_add(struct acpi_device *device) 
		}

	}



	result = sony_laptop_setup_input(device);

	if (result) {

		pr_err("Unable to create input devices\n");

		goto outplatform;

	}



	if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "ECON",

					 &handle))) {

		int arg = 1;
@@ -2659,12 +2665,6 @@ static int sony_nc_add(struct acpi_device *device) 
	}



	/* setup input devices and helper fifo */

	result = sony_laptop_setup_input(device);

	if (result) {

		pr_err("Unable to create input devices\n");

		goto outsnc;

	}



	if (acpi_video_backlight_support()) {

		pr_info("brightness ignored, must be controlled by ACPI video driver\n");

	} else {
@@ -2717,13 +2717,12 @@ static int sony_nc_add(struct acpi_device *device) 
		device_remove_file(&sony_pf_device->dev, &item->devattr);

	}

	sony_nc_backlight_cleanup();



	sony_laptop_remove_input();



      outsnc:

	sony_nc_function_cleanup(sony_pf_device);

	sony_nc_handles_cleanup(sony_pf_device);



outplatform:

	sony_laptop_remove_input();



outpresent:

	sony_pf_remove();