Re: [PATCH] platform/x86: sony-laptop: Fix unintentional fall-through

[Gustavo A. R. Silva]

Hi all,

Friendly ping:

Who can take this?

Thanks
--
Gustavo

On 4/24/19 1:09 PM, Gustavo A. R. Silva wrote:
> 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@xxxxxxxxxxxxxxx
> Signed-off-by: Gustavo A. R. Silva <gustavo@xxxxxxxxxxxxxx>
> ---
>  drivers/platform/x86/sony-laptop.c | 8 +++++---
>  1 file 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)
>