2022-05-19 15:47:48

by Heikki Krogerus

Subject: [PATCH] platform/x86: intel_cht_int33fe: Set driver data

Module removal fails because cht_int33fe_typec_remove()
tries to access driver data that does not exist. Fixing by
assigning the data at the end of probe.

Fixes: 915623a80b5a ("platform/x86: intel_cht_int33fe: Switch to DMI modalias based loading")
Signed-off-by: Heikki Krogerus <[email protected]>
---
drivers/platform/x86/intel/chtwc_int33fe.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/platform/x86/intel/chtwc_int33fe.c b/drivers/platform/x86/intel/chtwc_int33fe.c
index 0de509fbf0209..c52ac23e23315 100644
--- a/drivers/platform/x86/intel/chtwc_int33fe.c
+++ b/drivers/platform/x86/intel/chtwc_int33fe.c
@@ -389,6 +389,8 @@ static int cht_int33fe_typec_probe(struct platform_device *pdev)
goto out_unregister_fusb302;
}

+ platform_set_drvdata(pdev, data);
+
return 0;

out_unregister_fusb302:
--
2.35.1

2022-05-20 11:09:14

by Hans de Goede

Subject: Re: [PATCH] platform/x86: intel_cht_int33fe: Set driver data

Hi,

On 5/19/22 14:21, Heikki Krogerus wrote:
> Module removal fails because cht_int33fe_typec_remove()
> tries to access driver data that does not exist. Fixing by
> assigning the data at the end of probe.
>
> Fixes: 915623a80b5a ("platform/x86: intel_cht_int33fe: Switch to DMI modalias based loading")
> Signed-off-by: Heikki Krogerus <[email protected]>

Thank you for your patch, I've applied this patch to my review-hans
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.

Regards,

Hans




> ---
> drivers/platform/x86/intel/chtwc_int33fe.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/platform/x86/intel/chtwc_int33fe.c b/drivers/platform/x86/intel/chtwc_int33fe.c
> index 0de509fbf0209..c52ac23e23315 100644
> --- a/drivers/platform/x86/intel/chtwc_int33fe.c
> +++ b/drivers/platform/x86/intel/chtwc_int33fe.c
> @@ -389,6 +389,8 @@ static int cht_int33fe_typec_probe(struct platform_device *pdev)
> goto out_unregister_fusb302;
> }
>
> + platform_set_drvdata(pdev, data);
> +
> return 0;
>
> out_unregister_fusb302: