gpu: nvgpu: fix return code in *_ltc_cbc_ctrl()

Fix the return code for both gk20a_ and gm20b_ltc_cbc_ctrl()
functions. Before a positive return woudl always happen. Now,
if there's a timeout -EBUSY is returned.

Change-Id: Id76dc44af1376fceebf5043afb057c153cb0752e
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/729165
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
index c5d0f0c46cede961159de05b13c8f7c039f7caa5..02bea0a1c9d9fd34c1a8b8f1d84f148e9ab5667e 100644 (file)
--- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
@@ -167,7 +167,7 @@ static int gk20a_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
 out:
        trace_gk20a_ltc_cbc_ctrl_done(g->dev->name);
        mutex_unlock(&g->mm.l2_op_lock);
-       return 0;
+       return err;
 }
 
 

diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index 03307c01943393dbc83f1962364258e32f3e7790..9d16dba7eb5d00e88501ab1ac770b9e0baab654e 100644 (file)
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -165,7 +165,7 @@ int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
 out:
        trace_gk20a_ltc_cbc_ctrl_done(g->dev->name);
        mutex_unlock(&g->mm.l2_op_lock);
-       return 0;
+       return err;
 }
 
 void gm20b_ltc_init_fs_state(struct gk20a *g)