diff options
| author | Mattia Dongili <malattia@linux.it> | 2012-05-19 22:35:52 +0900 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2012-05-31 14:29:35 -0400 |
| commit | bab7084c745bf4d75b760728387f375fd34dc683 (patch) | |
| tree | 689c46ff60c0799a58d85068d86cab5c39ed8a39 /drivers/platform | |
| parent | 49f000adcad2d47f22ae97eb78fb2ef8081cd08f (diff) | |
| download | op-kernel-dev-bab7084c745bf4d75b760728387f375fd34dc683.zip op-kernel-dev-bab7084c745bf4d75b760728387f375fd34dc683.tar.gz | |
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>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/sony-laptop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index c3f54ad..2b72e47 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -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); |
