]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
memstick: rtsx_usb_ms: Add missing pm_runtime_disable() in probe function
authorKai-Heng Feng <kai.heng.feng@canonical.com>
Fri, 11 Jan 2019 08:30:00 +0000 (09:30 +0100)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 14 Jan 2019 09:28:55 +0000 (09:28 +0000)
BugLink: https://bugs.launchpad.net/bugs/1811337
If the probe fails, we should use pm_runtime_disable() to balance
pm_runtime_enable().

Add missing pm_runtime_disable() for rtsx_usb_ms.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit 01a7e8e066a505933b43a8df6da1ae1a1e7bddf2)
Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
Acked-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/memstick/host/rtsx_usb_ms.c

index 4f64563df7ded29f387cc0b32d2e147eb27e6848..e95e64974a9104185c5bc67b750b140104fd8931 100644 (file)
@@ -770,6 +770,7 @@ static int rtsx_usb_ms_drv_probe(struct platform_device *pdev)
        return 0;
 err_out:
        memstick_free_host(msh);
+       pm_runtime_disable(ms_dev(host));
        return err;
 }