From a3228b340c52f4ad2bf35af866f77603fe2d25d8 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 15 Aug 2018 10:24:08 +0100 Subject: igt/pm_rpm: Close local fd before trying to unload module Make sure everything we open in setup_environment() is paired to teardown_environment(). Fixes: d8e78990aa2b ("igt/pm_rpm: Test reaquisition of runtime-pm after module reload") Signed-off-by: Chris Wilson Reviewed-by: Imre Deak --- tests/pm_rpm.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index 65489bcd..c0212ed7 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -717,21 +717,23 @@ out: return wait_for_suspended(); } -static void restore_environment(void) +static void teardown_environment(void) { + close(msr_fd); + if (has_pc8) + close(pc8_status_fd); + + igt_restore_runtime_pm(); + igt_pm_restore_sata_link_power_management(pm_data); free(pm_data); -} -static void teardown_environment(void) -{ - restore_environment(); fini_mode_set_data(&ms_data); + close(debugfs); - drmClose(drm_fd); - close(msr_fd); - if (has_pc8) - close(pc8_status_fd); + close(drm_fd); + + has_runtime_pm = false; } static void basic_subtest(void) -- cgit v1.2.3