From 19609d86eb648cacbf0e051181e9c7581689ac25 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 21 Mar 2006 16:52:15 +0000 Subject: [PATCH] Fix PCI class and name extraction in alsaconf - Allow all PCI class 04xx, not only 040x - Fix the extraction of device name from lspci output ALSA bug#1935 --- alsaconf/alsaconf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in index 0eed914..814da4c 100644 --- a/alsaconf/alsaconf.in +++ b/alsaconf/alsaconf.in @@ -663,7 +663,7 @@ BEGIN { /^[]*PCI: /{ gsub(/0x/, ""); gsub(/=/, ":"); - x = sprintf ("'$lspci' -n 2>/dev/null| grep '"' 040.: '"' | grep %s", $2); + x = sprintf ("'$lspci' -n 2>/dev/null| grep '"' 04..: '"' | grep %s", $2); if (system (x) == 0) printf "%s %s\n", $2, driver >>"'"$FOUND"'" } @@ -738,7 +738,7 @@ BEGIN { # find_device_name () { if expr "$1" : '[0-9a-f][0-9a-f][0-9a-f][0-9a-f]:[0-9a-f][0-9a-f][0-9a-f][0-9a-f]' >/dev/null; then - $lspci -d $1 2>/dev/null| sed -e 's/^.*:..\.. Multimedia audio controller: //g' + $lspci -d $1 2>/dev/null| sed -e 's/^.*:..\.. [^:]*: //g' return elif expr "$1" : '[A-Z@][A-Z@][A-Z@][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' >/dev/null; then cardname=`grep '^Card [0-9]\+ .'$1':' $DUMP | head -n 1 | sed -e 's/^Card [0-9]\+ '\''.*:\(.*\)'\'' .*$/\1/'` -- 2.47.1