summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2016-10-03 17:00:01 +0300
committerJani Nikula <jani.nikula@intel.com>2016-10-04 09:58:47 +0300
commit832dfbc6e9045b016cc8bd42575c6f3c7be0b051 (patch)
tree60f1b08dedc945b7247a8cb5ceba75f1f1585a7f
parent2085e1476e6e9dbe6fe4c67d5aeed26d290f6d54 (diff)
igt/drv_module_reload_basic: let intel_ips removal errors through
Only try removing intel_ips if it's actually loaded, and let the errors through to the logs if removal fails. Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-rwxr-xr-xtests/drv_module_reload_basic6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/drv_module_reload_basic b/tests/drv_module_reload_basic
index a221d65f..93cf7c00 100755
--- a/tests/drv_module_reload_basic
+++ b/tests/drv_module_reload_basic
@@ -36,8 +36,10 @@ function reload() {
rmmod snd_hda_intel && snd_hda_intel_unloaded=1
fi
- #ignore errors in ips - gen5 only
- rmmod intel_ips &> /dev/null
+ # gen5 only
+ if mod_loaded intel_ips; then
+ rmmod intel_ips
+ fi
rmmod i915 || return $IGT_EXIT_SKIP
#ignore errors in intel-gtt, often built-in
rmmod intel-gtt &> /dev/null