r8169: use pm_runtime_put_sync in rtl_open error path
We can safely runtime-suspend the chip if rtl_open() fails. Therefore switch the error path to use pm_runtime_put_sync() as well. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Link: https://lore.kernel.org/r/aa093b1e-f295-5700-1cb7-954b54dd8f17@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
3a689e3497
commit
1c470b53ec
@ -4701,7 +4701,7 @@ static int rtl_open(struct net_device *dev)
|
||||
tp->TxDescArray = dma_alloc_coherent(&pdev->dev, R8169_TX_RING_BYTES,
|
||||
&tp->TxPhyAddr, GFP_KERNEL);
|
||||
if (!tp->TxDescArray)
|
||||
goto err_pm_runtime_put;
|
||||
goto out;
|
||||
|
||||
tp->RxDescArray = dma_alloc_coherent(&pdev->dev, R8169_RX_RING_BYTES,
|
||||
&tp->RxPhyAddr, GFP_KERNEL);
|
||||
@ -4726,9 +4726,9 @@ static int rtl_open(struct net_device *dev)
|
||||
rtl8169_up(tp);
|
||||
rtl8169_init_counter_offsets(tp);
|
||||
netif_start_queue(dev);
|
||||
|
||||
pm_runtime_put_sync(&pdev->dev);
|
||||
out:
|
||||
pm_runtime_put_sync(&pdev->dev);
|
||||
|
||||
return retval;
|
||||
|
||||
err_free_irq:
|
||||
@ -4744,8 +4744,6 @@ err_free_tx_0:
|
||||
dma_free_coherent(&pdev->dev, R8169_TX_RING_BYTES, tp->TxDescArray,
|
||||
tp->TxPhyAddr);
|
||||
tp->TxDescArray = NULL;
|
||||
err_pm_runtime_put:
|
||||
pm_runtime_put_noidle(&pdev->dev);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user