diff mbox series

usb: roles: intel_xhci: Fix Unbalanced pm_runtime_enable

Message ID 1539060767-12858-1-git-send-email-wan.ahmad.zainie.wan.mohamad@intel.com (mailing list archive)
State New, archived
Headers show
Series usb: roles: intel_xhci: Fix Unbalanced pm_runtime_enable | expand

Commit Message

Wan Ahmad Zainie Oct. 9, 2018, 4:52 a.m. UTC 
From: Wan Ahmad Zainie <wan.ahmad.zainie.wan.mohamad@intel.com>

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: <stable@vger.kernel.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Wan Ahmad Zainie <wan.ahmad.zainie.wan.mohamad@intel.com>
---
 drivers/usb/roles/intel-xhci-usb-role-switch.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Hans de Goede Oct. 10, 2018, 11:08 a.m. UTC | #1 
Hi,

On 09-10-18 06:52, wan.ahmad.zainie.wan.mohamad@intel.com wrote:
> From: Wan Ahmad Zainie <wan.ahmad.zainie.wan.mohamad@intel.com>
> 
> 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: <stable@vger.kernel.org>
> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> Signed-off-by: Wan Ahmad Zainie <wan.ahmad.zainie.wan.mohamad@intel.com>

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

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

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;
>   }
>
diff mbox series

Patch

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;
 }