Module Name: src Committed By: riastradh Date: Sun Dec 19 11:53:18 UTC 2021
Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: intel_uncore.c Log Message: Use hrtimer_destroy instead of hrtimer_cancel to free Author: Maya Rashish <m...@netbsd.org> Committer: Taylor R Campbell <riastr...@netbsd.org> To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.17 src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.18 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.17 Sun Dec 19 11:49:11 2021 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c Sun Dec 19 11:53:18 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_uncore.c,v 1.17 2021/12/19 11:49:11 riastradh Exp $ */ +/* $NetBSD: intel_uncore.c,v 1.18 2021/12/19 11:53:18 riastradh Exp $ */ /* * Copyright © 2013 Intel Corporation @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.17 2021/12/19 11:49:11 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.18 2021/12/19 11:53:18 riastradh Exp $"); #include <linux/pm_runtime.h> #include <asm/iosf_mbi.h> @@ -1519,6 +1519,7 @@ static void fw_domain_fini(struct intel_ uncore->fw_domains &= ~BIT(domain_id); WARN_ON(d->wake_count); WARN_ON(hrtimer_cancel(&d->timer)); + hrtimer_destroy(&d->timer); kfree(d); }