[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200521072809.17390-1-dinghao.liu@zju.edu.cn>
Date: Thu, 21 May 2020 15:28:09 +0800
From: Dinghao Liu <dinghao.liu@....edu.cn>
To: dinghao.liu@....edu.cn, kjlu@....edu
Cc: Mathias Nyman <mathias.nyman@...el.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] xhci: Fix runtime PM imbalance on error
When dma_set_mask_and_coherent() returns an error code,
a pairing runtime PM usage counter decrement is needed
to keep the counter balanced.
Also, call pm_runtime_disable() when dma_set_mask_and_coherent()
returns an error code.
Signed-off-by: Dinghao Liu <dinghao.liu@....edu.cn>
---
drivers/usb/host/xhci-histb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/host/xhci-histb.c b/drivers/usb/host/xhci-histb.c
index 5546e7e013a8..1d22a664477f 100644
--- a/drivers/usb/host/xhci-histb.c
+++ b/drivers/usb/host/xhci-histb.c
@@ -240,7 +240,7 @@ static int xhci_histb_probe(struct platform_device *pdev)
/* Initialize dma_mask and coherent_dma_mask to 32-bits */
ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
if (ret)
- return ret;
+ goto disable_pm
hcd = usb_create_hcd(driver, dev, dev_name(dev));
if (!hcd) {
--
2.17.1
Powered by blists - more mailing lists