diff options
| author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2019-04-24 13:09:34 -0500 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2019-05-09 00:33:02 +0300 |
| commit | 1cbd7a64959d33e7a2a1fa2bf36a62b350a9fcbd (patch) | |
| tree | ef19ae916af29b50b5e9b994f644b33feacfbc12 /drivers | |
| parent | 6d1f8b3d75419a8659ac916a1e9543bb3513a882 (diff) | |
| download | linux-stable-1cbd7a64959d33e7a2a1fa2bf36a62b350a9fcbd.tar.gz linux-stable-1cbd7a64959d33e7a2a1fa2bf36a62b350a9fcbd.tar.bz2 linux-stable-1cbd7a64959d33e7a2a1fa2bf36a62b350a9fcbd.zip | |
platform/x86: sony-laptop: Fix unintentional fall-through
It seems that the default case should return AE_CTRL_TERMINATE, instead
of falling through to case ACPI_RESOURCE_TYPE_END_TAG and returning AE_OK;
otherwise the line of code at the end of the function is unreachable and
makes no sense:
return AE_CTRL_TERMINATE;
This fix is based on the following thread of discussion:
https://lore.kernel.org/patchwork/patch/959782/
Fixes: 33a04454527e ("sony-laptop: Add SNY6001 device handling (sonypi reimplementation)")
Cc: stable@vger.kernel.org
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/x86/sony-laptop.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 4bfbfa3f78e6..2058445fc456 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -4424,14 +4424,16 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context) } return AE_OK; } + + case ACPI_RESOURCE_TYPE_END_TAG: + return AE_OK; + default: dprintk("Resource %d isn't an IRQ nor an IO port\n", resource->type); + return AE_CTRL_TERMINATE; - case ACPI_RESOURCE_TYPE_END_TAG: - return AE_OK; } - return AE_CTRL_TERMINATE; } static int sony_pic_possible_resources(struct acpi_device *device) |