diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 82f62f015c41..c61753311771 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -678,10 +678,10 @@ static int msm_open(struct drm_device *dev, struct drm_file *file)
 	if (IS_ERR(ctx))
 		return PTR_ERR(ctx);
 
-	if (ctx)
+	if (ctx) {
 		INIT_LIST_HEAD(&ctx->counters);
-
-	msm_submitqueue_init(ctx);
+		msm_submitqueue_init(ctx);
+	}
 
 	file->driver_priv = ctx;