video: tegra: lock around DC suspend/resume

Change-Id: I9c134a2417106538b15cc1cfd615cfb65573e878
Signed-off-by: Erik Gilling <konkers@android.com>

diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 16e6a454336d86a2867b953d02ccb3064f194b94..da114d8502af3a14fdbe92892b12d5e07a5e5254 100644 (file)
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -1066,8 +1066,10 @@ static int tegra_dc_suspend(struct nvhost_device *ndev, pm_message_t state)
 
        dev_info(&ndev->dev, "suspend\n");
 
+       mutex_lock(&dc->lock);
        if (dc->enabled)
                _tegra_dc_disable(dc);
+       mutex_unlock(&dc->lock);
 
        return 0;
 }
@@ -1078,8 +1080,10 @@ static int tegra_dc_resume(struct nvhost_device *ndev)
 
        dev_info(&ndev->dev, "resume\n");
 
+       mutex_lock(&dc->lock);
        if (dc->enabled)
                _tegra_dc_enable(dc);
+       mutex_unlock(&dc->lock);
 
        return 0;
 }