| Message ID | bb8d43fd8220e6339d78db283181e6fb7d4f3fe7.1475504339.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On ma, 2016-10-03 at 17:20 +0300, Jani Nikula wrote: > Only try removing snd_hda_intel if it's actually loaded, and let the > errors through to the logs if removal fails. This is a clue if i915 > removal fails later. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Regards, Joonas
diff --git a/tests/drv_module_reload_basic b/tests/drv_module_reload_basic index 4f3172788eca..a221d65f725a 100755 --- a/tests/drv_module_reload_basic +++ b/tests/drv_module_reload_basic @@ -32,7 +32,9 @@ function reload() { # The sound driver uses our power well pkill alsactl snd_hda_intel_unloaded=0 - rmmod snd_hda_intel &> /dev/null && snd_hda_intel_unloaded=1 + if mod_loaded snd_hda_intel; then + rmmod snd_hda_intel && snd_hda_intel_unloaded=1 + fi #ignore errors in ips - gen5 only rmmod intel_ips &> /dev/null
Only try removing snd_hda_intel if it's actually loaded, and let the errors through to the logs if removal fails. This is a clue if i915 removal fails later. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- tests/drv_module_reload_basic | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)