diff options
| author | Deepak Nibade <dnibade@nvidia.com> | 2014-07-28 09:41:13 -0400 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:10:42 -0400 |
| commit | b0759dc68d347ad3d02057923426c1feb2bab906 (patch) | |
| tree | 81b73973f0241a561885871e412f33dba6f1af27 /drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |
| parent | a20bb7dde2de191cb18545d6ccd98b30a6faaf84 (diff) | |
gpu: nvgpu: return error from mutex_acquire()
return error from pmu_mutex_acquire() and release() if
pmu->initialized is not set
Bug 1533644
Change-Id: I341a5831bc5beeccb4587668f61c954ce7576226
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.c')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index b147c66f..068611e3 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
| @@ -1438,7 +1438,7 @@ int pmu_mutex_acquire(struct pmu_gk20a *pmu, u32 id, u32 *token) | |||
| 1438 | u32 data, owner, max_retry; | 1438 | u32 data, owner, max_retry; |
| 1439 | 1439 | ||
| 1440 | if (!pmu->initialized) | 1440 | if (!pmu->initialized) |
| 1441 | return 0; | 1441 | return -EINVAL; |
| 1442 | 1442 | ||
| 1443 | BUG_ON(!token); | 1443 | BUG_ON(!token); |
| 1444 | BUG_ON(!PMU_MUTEX_ID_IS_VALID(id)); | 1444 | BUG_ON(!PMU_MUTEX_ID_IS_VALID(id)); |
| @@ -1507,7 +1507,7 @@ int pmu_mutex_release(struct pmu_gk20a *pmu, u32 id, u32 *token) | |||
| 1507 | u32 owner, data; | 1507 | u32 owner, data; |
| 1508 | 1508 | ||
| 1509 | if (!pmu->initialized) | 1509 | if (!pmu->initialized) |
| 1510 | return 0; | 1510 | return -EINVAL; |
| 1511 | 1511 | ||
| 1512 | BUG_ON(!token); | 1512 | BUG_ON(!token); |
| 1513 | BUG_ON(!PMU_MUTEX_ID_IS_VALID(id)); | 1513 | BUG_ON(!PMU_MUTEX_ID_IS_VALID(id)); |