Subject: [PATCH] usb: roles: intel_xhci: Fix Unbalanced pm_runtime_enable

From: Wan Ahmad Zainie <[email protected]>

Add missing pm_runtime_disable() to remove(), in order to avoid
an Unbalanced pm_runtime_enable when the module is removed and
re-probed.

Error log:
root@intel-corei7-64:~# modprobe -r intel_xhci_usb_role_switch
root@intel-corei7-64:~# modprobe intel_xhci_usb_role_switch
intel_xhci_usb_sw intel_xhci_usb_sw: Unbalanced pm_runtime_enable!

Fixes: cb2968468605 (usb: roles: intel_xhci: Enable runtime PM)
Cc: <[email protected]>
Reviewed-by: Heikki Krogerus <[email protected]>
Signed-off-by: Wan Ahmad Zainie <[email protected]>
---
drivers/usb/roles/intel-xhci-usb-role-switch.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/usb/roles/intel-xhci-usb-role-switch.c b/drivers/usb/roles/intel-xhci-usb-role-switch.c
index 1fb3dd0f1dfa..277de96181f9 100644
--- a/drivers/usb/roles/intel-xhci-usb-role-switch.c
+++ b/drivers/usb/roles/intel-xhci-usb-role-switch.c
@@ -161,6 +161,8 @@ static int intel_xhci_usb_remove(struct platform_device *pdev)
{
struct intel_xhci_usb_data *data = platform_get_drvdata(pdev);

+ pm_runtime_disable(&pdev->dev);
+
usb_role_switch_unregister(data->role_sw);
return 0;
}
--
1.9.1



2018-10-10 11:10:55

by Hans de Goede

[permalink] [raw]
Subject: Re: [PATCH] usb: roles: intel_xhci: Fix Unbalanced pm_runtime_enable

Hi,

On 09-10-18 06:52, [email protected] wrote:
> From: Wan Ahmad Zainie <[email protected]>
>
> Add missing pm_runtime_disable() to remove(), in order to avoid
> an Unbalanced pm_runtime_enable when the module is removed and
> re-probed.
>
> Error log:
> root@intel-corei7-64:~# modprobe -r intel_xhci_usb_role_switch
> root@intel-corei7-64:~# modprobe intel_xhci_usb_role_switch
> intel_xhci_usb_sw intel_xhci_usb_sw: Unbalanced pm_runtime_enable!
>
> Fixes: cb2968468605 (usb: roles: intel_xhci: Enable runtime PM)
> Cc: <[email protected]>
> Reviewed-by: Heikki Krogerus <[email protected]>
> Signed-off-by: Wan Ahmad Zainie <[email protected]>

Thank you for the patch, patch looks good to me:

Reviewed-by: Hans de Goede <[email protected]>

Regards,

Hans



> ---
> drivers/usb/roles/intel-xhci-usb-role-switch.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/usb/roles/intel-xhci-usb-role-switch.c b/drivers/usb/roles/intel-xhci-usb-role-switch.c
> index 1fb3dd0f1dfa..277de96181f9 100644
> --- a/drivers/usb/roles/intel-xhci-usb-role-switch.c
> +++ b/drivers/usb/roles/intel-xhci-usb-role-switch.c
> @@ -161,6 +161,8 @@ static int intel_xhci_usb_remove(struct platform_device *pdev)
> {
> struct intel_xhci_usb_data *data = platform_get_drvdata(pdev);
>
> + pm_runtime_disable(&pdev->dev);
> +
> usb_role_switch_unregister(data->role_sw);
> return 0;
> }
>