hal: Branch 'master'

[Danny Kukawka]

 hald/linux/probing/probe-storage.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree f43039ee9a0fea64b8550a0096e37b6954f60628 (from 8a485fbd3ad451c8a76b72d26d674c43545e6644)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jul 26 21:49:35 2007 +0200

    fix compiler warning and error in if statement
    
    Fix compiler warning about possible error in if statement which is
    also logical incorrect.

diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c
index 83b42bd..458c5ff 100644
--- a/hald/linux/probing/probe-storage.c
+++ b/hald/linux/probing/probe-storage.c
@@ -464,10 +464,10 @@ main (int argc, char *argv[])
 				 */
 
 				if (volume_id_get_usage(vid, &usage) &&
-				    strcmp(usage, "filesystem") == 0 ||
-				    strcmp(usage, "raid") == 0 ||
-				    strcmp(usage, "other") == 0 ||
-				    strcmp(usage, "crypto") == 0)
+				    ( strcmp(usage, "filesystem") == 0 ||
+				      strcmp(usage, "raid") == 0 ||
+				      strcmp(usage, "other") == 0 ||
+				      strcmp(usage, "crypto") == 0))
 					ret = 2;
 			} else {
 				;