From 06cf8947da8b5cc0bd01847b3c8616dc4b22b53b Mon Sep 17 00:00:00 2001
From: Olaf Hering <olh@suse.de>
Date: Sat, 10 Feb 2007 01:45:48 -0800
Subject: [PATCH] --- yaml --- r: 47571 b: refs/heads/master c:
 a470e18f53940e7bd07b09f01c0970f653e268bf h: refs/heads/master i:   47569:
 35751e69a555378575ff5a64656498d4c6abc47f   47567:
 1746056588ce2c701fae30208669b00e55f0c0ed v: v3

---
 [refs]                      | 2 +-
 trunk/fs/partitions/msdos.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5681e065086f..bd3cb1770255 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4419d1ac7def3c2f74cab15e4a1c69cffcaadedd
+refs/heads/master: a470e18f53940e7bd07b09f01c0970f653e268bf
diff --git a/trunk/fs/partitions/msdos.c b/trunk/fs/partitions/msdos.c
index dafd3b6b2dc3..78443e07b3c4 100644
--- a/trunk/fs/partitions/msdos.c
+++ b/trunk/fs/partitions/msdos.c
@@ -68,10 +68,10 @@ static int aix_magic_present(unsigned char *p, struct block_device *bdev)
 	unsigned char *d;
 	int slot, ret = 0;
 
-	if (p[0] != AIX_LABEL_MAGIC1 &&
-		p[1] != AIX_LABEL_MAGIC2 &&
-		p[2] != AIX_LABEL_MAGIC3 &&
-		p[3] != AIX_LABEL_MAGIC4)
+	if (!(p[0] == AIX_LABEL_MAGIC1 &&
+		p[1] == AIX_LABEL_MAGIC2 &&
+		p[2] == AIX_LABEL_MAGIC3 &&
+		p[3] == AIX_LABEL_MAGIC4))
 		return 0;
 	/* Assume the partition table is valid if Linux partitions exists */
 	for (slot = 1; slot <= 4; slot++, pt++) {