Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / drivers / gpu / drm / nouveau / nvkm / subdev / pmu / gk20a.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
index 9ca0db796cbe4fe581d0b88b6f7a71c1a5434483..978aae3c10017510010600e7ef701ca3605beafc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
@@ -158,7 +158,7 @@ static void
 gk20a_pmu_fini(struct nvkm_pmu *pmu)
 {
        struct gk20a_pmu *gpmu = gk20a_pmu(pmu);
-       nvkm_timer_alarm_cancel(pmu->subdev.device->timer, &gpmu->alarm);
+       nvkm_timer_alarm(pmu->subdev.device->timer, 0, &gpmu->alarm);
 
        nvkm_falcon_put(pmu->falcon, &pmu->subdev);
 }