samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "soc: swr-mstr: Fix KW issue in swrm_remove"

Browse Source
This commit is contained in:
qctecmdr
2020-06-29 11:21:31 -07:00
committed by Gerrit - the friendly Code Review server
parent 668ef31d07 269c76b335
commit dd29f28450
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
soc/swr-mstr-ctrl.c
View File

@@ -2734,13 +2734,13 @@ err_mstr_fail:
swrm->reg_irq(swrm->handle, swr_mstr_interrupt, swrm->reg_irq(swrm->handle, swr_mstr_interrupt,
swrm, SWR_IRQ_FREE); swrm, SWR_IRQ_FREE);
} else if (swrm->irq) { } else if (swrm->irq) {
free_irq(swrm->irq, swrm);
irqd_set_trigger_type( irqd_set_trigger_type(
irq_get_irq_data(swrm->irq), irq_get_irq_data(swrm->irq),
IRQ_TYPE_NONE); IRQ_TYPE_NONE);
if (swrm->swr_irq_wakeup_capable)
irq_set_irq_wake(swrm->irq, 0);
free_irq(swrm->irq, swrm);
} }
if (swrm->swr_irq_wakeup_capable)
irq_set_irq_wake(swrm->irq, 0);
err_irq_fail: err_irq_fail:
mutex_destroy(&swrm->irq_lock); mutex_destroy(&swrm->irq_lock);
mutex_destroy(&swrm->mlock); mutex_destroy(&swrm->mlock);
@@ -2764,15 +2764,15 @@ static int swrm_remove(struct platform_device *pdev)
swrm->reg_irq(swrm->handle, swr_mstr_interrupt, swrm->reg_irq(swrm->handle, swr_mstr_interrupt,
swrm, SWR_IRQ_FREE); swrm, SWR_IRQ_FREE);
} else if (swrm->irq) { } else if (swrm->irq) {
free_irq(swrm->irq, swrm);
irqd_set_trigger_type( irqd_set_trigger_type(
irq_get_irq_data(swrm->irq), irq_get_irq_data(swrm->irq),
IRQ_TYPE_NONE); IRQ_TYPE_NONE);
if (swrm->swr_irq_wakeup_capable)
irq_set_irq_wake(swrm->irq, 0);
free_irq(swrm->irq, swrm);
} else if (swrm->wake_irq > 0) { } else if (swrm->wake_irq > 0) {
free_irq(swrm->wake_irq, swrm); free_irq(swrm->wake_irq, swrm);
} }
if (swrm->swr_irq_wakeup_capable)
irq_set_irq_wake(swrm->irq, 0);
cancel_work_sync(&swrm->wakeup_work); cancel_work_sync(&swrm->wakeup_work);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
pm_runtime_set_suspended(&pdev->dev); pm_runtime_set_suspended(&pdev->dev);