hal: Branch 'master'

[David Zeuthen]

 hald/linux/device.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree bae149a89341750ad52a07dd27a337a1b7659ae7 (from 72e4beb596c2fe3c772af421a53f292df7cb0776)
Author: Matthias Kretz <kretz at kde.org>
Date:   Mon Feb 5 19:20:07 2007 -0500

    reread /proc/cards to make hotplugging sound cards work
    
    I just found a bug. When hotplugging a device the card_id cannot be found
    since the /proc/cards file is not read again.

diff --git a/hald/linux/device.c b/hald/linux/device.c
index c22077e..d5cea0b 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -568,7 +568,7 @@ asound_card_id_set (int cardnum, HalDevi
 
 	snprintf (aprocdir, sizeof (aprocdir), "%s/asound", get_hal_proc_path ());
 	snprintf (linestart, sizeof (linestart), "%2d [", cardnum);
-	alsaname = hal_util_grep_file_next_line (aprocdir, "cards", linestart, TRUE);
+	alsaname = hal_util_grep_file_next_line (aprocdir, "cards", linestart, FALSE);
 	if (alsaname != NULL) {
 		gchar *end;
 		end = strstr (alsaname, " at ");