On Mon, 2 Jan 2023, Basavaraj Natikar wrote:
> Return directly instead of using existing goto will not cleanup
> previously allocated resources. Hence replace return with goto
> to fix warning unwind goto which cleanups previously allocated
> resources.
>
> Fixes: 93ce5e0231d7 ("HID: amd_sfh: Implement SFH1.1 functionality")
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Reported-by: Dan Carpenter <error27@xxxxxxxxx>
> Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@xxxxxxx>
> ---
> drivers/hid/amd-sfh-hid/amd_sfh_client.c | 2 +-
> drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
> index ab125f79408f..1fb0f7105fb2 100644
> --- a/drivers/hid/amd-sfh-hid/amd_sfh_client.c
> +++ b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
> @@ -282,7 +282,7 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
> }
> rc = mp2_ops->get_rep_desc(cl_idx, cl_data->report_descr[i]);
> if (rc)
> - return rc;
> + goto cleanup;
> mp2_ops->start(privdata, info);
> status = amd_sfh_wait_for_response
> (privdata, cl_data->sensor_idx[i], SENSOR_ENABLED);
> diff --git a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
> index 4da2f9f62aba..a1d6e08fab7d 100644
> --- a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
> +++ b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
> @@ -160,7 +160,7 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata)
> }
> rc = mp2_ops->get_rep_desc(cl_idx, cl_data->report_descr[i]);
> if (rc)
> - return rc;
> + goto cleanup;
>
> writel(0, privdata->mmio + AMD_P2C_MSG(0));
Applied to for-6.2/upstream-fixes, thanks.
--
Jiri Kosina
SUSE Labs
