diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 3a898033c178..aa5589b7bf54 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -1743,6 +1743,12 @@ static int adreno_pm_suspend(struct device *dev)
 	status = ops->pm_suspend(adreno_dev);
 	mutex_unlock(&device->mutex);
 
+	if (status)
+		return status;
+
+	flush_workqueue(device->events_wq);
+	flush_workqueue(kgsl_driver.mem_workqueue);
+
 	return status;
 }