SVN: geninitrd/trunk/mod-sata.sh

[arekm]

Author: arekm
Date: Sun Mar  6 17:14:38 2011
New Revision: 12195

Modified:
   geninitrd/trunk/mod-sata.sh
Log:
Check class/class_mask when walking over modules.pcimap (fixes a bug where snd-hda-intel devices were found by this).

Modified: geninitrd/trunk/mod-sata.sh
==============================================================================
--- geninitrd/trunk/mod-sata.sh	(original)
+++ geninitrd/trunk/mod-sata.sh	Sun Mar  6 17:14:38 2011
@@ -17,7 +17,7 @@
 
 # private until only mod-sata uses the function
 find_modules_by_class() {
-	local class=$1
+	local req_class=$1
 
 	# no pcimap, nothing to lookup from
 	if [ ! -f "$pcimap" ]; then
@@ -28,10 +28,12 @@
 		return
 	fi
 
-	set -- $($lspci -n | awk -vclass=$class '$2 == class":" {split($3, p, ":"); printf("0x0000%s 0x0000%s\n", p[1], p[2])}')
+	set -- $($lspci -n | awk -vclass=$req_class '$2 == class":" {split($3, p, ":"); printf("0x0000%s 0x0000%s\n", p[1], p[2])}')
 
 	local PCI_ANY_ID=0x0000ffff pci_module vendor device subvendor subdevice class class_mask driver_data
 	while read pci_module vendor device subvendor subdevice class class_mask driver_data; do
+		# match class
+		[ "$(($req_class & $class_mask))" = "$class" ] || continue
 		# match vendor
 		[ "$1" = "$vendor" ] || continue
 		# match device, allow PCI_ANY_ID