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

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

sony-laptop: adjust error handling in finding SNC handles 



All handles must be greater than 0, also return more meaningful error
codes on invalid conditions.

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

drivers/platform/x86/sony-laptop.c

+4 −4
Original line number Diff line number Diff line
@@ -870,8 +870,8 @@ static int sony_find_snc_handle(int handle) 
	int i;



	/* not initialized yet, return early */

	if (!handles)

		return -1;

	if (!handles || !handle)

		return -EINVAL;



	for (i = 0; i < 0x10; i++) {

		if (handles->cap[i] == handle) {
@@ -881,7 +881,7 @@ static int sony_find_snc_handle(int handle) 
		}

	}

	dprintk("handle 0x%.4x not found\n", handle);

	return -1;

	return -EINVAL;

}



static int sony_call_snc_handle(int handle, int argument, int *result)
@@ -890,7 +890,7 @@ static int sony_call_snc_handle(int handle, int argument, int *result) 
	int offset = sony_find_snc_handle(handle);



	if (offset < 0)

		return -1;

		return offset;



	arg = offset | argument;

	ret = sony_nc_int_call(sony_nc_acpi_handle, "SN07", &arg, result);