| From 1cbd7a64959d33e7a2a1fa2bf36a62b350a9fcbd Mon Sep 17 00:00:00 2001 |
| From: "Gustavo A. R. Silva" <gustavo@embeddedor.com> |
| Date: Wed, 24 Apr 2019 13:09:34 -0500 |
| Subject: platform/x86: sony-laptop: Fix unintentional fall-through |
| |
| From: Gustavo A. R. Silva <gustavo@embeddedor.com> |
| |
| commit 1cbd7a64959d33e7a2a1fa2bf36a62b350a9fcbd upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/platform/x86/sony-laptop.c | 8 +++++--- |
| 1 file changed, 5 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/platform/x86/sony-laptop.c |
| +++ b/drivers/platform/x86/sony-laptop.c |
| @@ -4394,14 +4394,16 @@ sony_pic_read_possible_resource(struct a |
| } |
| 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) |
