From a9f75f87937a2d9ad88bbd992ee3d5c91c18c260 Mon Sep 17 00:00:00 2001 From: Ken Adams Date: Thu, 10 Apr 2014 08:33:30 -0700 Subject: [PATCH] gpu: nvgpu: gk20a: minor fixes fixes one use of unitialized var renames a register to make it match dev_* file. Change-Id: Iafba659bbf2df509e0b494b2c5dab3819bf650ef Signed-off-by: Ken Adams Reviewed-on: http://git-master/r/394792 --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 2 +- drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index aedd2055e..e6bdf52cf 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -338,7 +338,7 @@ static int gr_gk20a_wait_fe_idle(struct gk20a *g, unsigned long end_jiffies, if (!gr_status_fe_method_upper_v(val) && !gr_status_fe_method_lower_v(val) && - !gr_status_fe_method_fe_gi_v(val)) { + !gr_status_fe_gi_v(val)) { gk20a_dbg_fn("done"); return 0; } diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 8e2a62ded..0f1af8ab7 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c @@ -2663,7 +2663,7 @@ static int pmu_handle_perfmon_event(struct pmu_gk20a *pmu, static int pmu_handle_event(struct pmu_gk20a *pmu, struct pmu_msg *msg) { - int err; + int err = 0; gk20a_dbg_fn("");