2 files changed, 11 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index 10f1213b..d2d8c094 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
@@ -122,7 +122,11 @@ static int gk20a_channel_syncpt_wait_fd(struct gk20a_channel_sync *s, int fd,
                         sync_fence_put(sync_fence);
                         return -EINVAL;
                 }
+#if !(LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0))
         }
+#else
+        }
+#endif
 
         num_wait_cmds = nvhost_sync_num_pts(sync_fence);
         if (num_wait_cmds == 0) {
@@ -160,8 +164,11 @@ static int gk20a_channel_syncpt_wait_fd(struct gk20a_channel_sync *s, int fd,
                                         wait_value);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
                 i++;
-#endif
         }
+#else
+        }
+#endif
+
         WARN_ON(i != num_wait_cmds);
         sync_fence_put(sync_fence);
 
diff --git a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
index 21622d3d..3e14fa9c 100644
--- a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
@@ -151,12 +151,12 @@ static struct gk20a_sync_pt *gk20a_sync_pt_create_shared(
         /* Store the dependency fence for this pt. */
         if (dependency) {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
-                if (dependency->status == 0) {
+                if (dependency->status == 0)
 #else
-                if (!atomic_read(&dependency->status)) {
+                if (!atomic_read(&dependency->status))
 #endif
                         shared->dep = dependency;
-                } else {
+                else {
                         shared->dep_timestamp = ktime_get();
                         sync_fence_put(dependency);
                 }