Merge "soc: swr-mstr: Ignore device up during SSR"

This commit is contained in:
Linux Build Service Account 2018-11-14 23:15:20 -08:00 • committed by Gerrit - the friendly Code Review server
commit fab8a74412

View file

@ -2133,6 +2133,13 @@ int swrm_wcd_notify(struct platform_device *pdev, u32 id, void *data)
break;
case SWR_DEVICE_UP:
dev_dbg(swrm->dev, "%s: swr master up called\n", __func__);
mutex_lock(&swrm->devlock);
if (!swrm->dev_up) {
dev_dbg(swrm->dev, "SSR not complete yet\n");
mutex_unlock(&swrm->devlock);
return -EBUSY;
}
mutex_unlock(&swrm->devlock);
mutex_lock(&swrm->mlock);
pm_runtime_mark_last_busy(&pdev->dev);
pm_runtime_get_sync(&pdev->dev);