dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Mattia Dongili <malattia@linux.it>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Mattia Dongili 2012-05-19 22:35:52 +09:00 committed by Matthew Garrett
parent 49f000adca
commit bab7084c74
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/platform/x86/sony-laptop.c
View File

@ -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);