diff options
author | Alex Waterman <alexw@nvidia.com> | 2015-04-08 15:19:45 -0400 |
---|---|---|
committer | Ishan Mittal <imittal@nvidia.com> | 2015-05-18 01:48:54 -0400 |
commit | e3b62a54c94dda47ecb91f348d9958da40c8ee6c (patch) | |
tree | 34ae45ca02ef3f27b4eaa4e2f61af24e6ccf808e /drivers/gpu | |
parent | 72b565452ee1caeac67a478e69428bfb4efa6c40 (diff) |
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ltc_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c index c5d0f0c4..02bea0a1 100644 --- 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, | |||
167 | out: | 167 | out: |
168 | trace_gk20a_ltc_cbc_ctrl_done(g->dev->name); | 168 | trace_gk20a_ltc_cbc_ctrl_done(g->dev->name); |
169 | mutex_unlock(&g->mm.l2_op_lock); | 169 | mutex_unlock(&g->mm.l2_op_lock); |
170 | return 0; | 170 | return err; |
171 | } | 171 | } |
172 | 172 | ||
173 | 173 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index 03307c01..9d16dba7 100644 --- 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, | |||
165 | out: | 165 | out: |
166 | trace_gk20a_ltc_cbc_ctrl_done(g->dev->name); | 166 | trace_gk20a_ltc_cbc_ctrl_done(g->dev->name); |
167 | mutex_unlock(&g->mm.l2_op_lock); | 167 | mutex_unlock(&g->mm.l2_op_lock); |
168 | return 0; | 168 | return err; |
169 | } | 169 | } |
170 | 170 | ||
171 | void gm20b_ltc_init_fs_state(struct gk20a *g) | 171 | void gm20b_ltc_init_fs_state(struct gk20a *g) |