From e22901a7950425e4b1ccc428ffd8a7f7c7373741 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mageia.org>
Date: Wed, 20 Apr 2011 23:05:34 +0000
Subject: Try unloading unconfigured drivers in "display_driver_helper
 --check-loaded".

---
 tools/display_driver_helper | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools/display_driver_helper')

diff --git a/tools/display_driver_helper b/tools/display_driver_helper
index 02dd482..9376d43 100644
--- a/tools/display_driver_helper
+++ b/tools/display_driver_helper
@@ -122,7 +122,8 @@ check_dkms_status() {
 # Check if all loaded kernel modules have correct xorg.conf
 check_loaded() {
 	for module in $(grep -oE "^($KNOWN_MODULES) " /proc/modules); do
-		check_driver "$module" || return 1
+		# try to unload the driver in case it is not in use before bailing
+		check_driver "$module" || rmmod "$module" &>/dev/null || return 1
 	done
 	return 0
 }
-- 
cgit v1.2.1