From: Al Viro <viro@ftp.linux.org.uk>
Date: Sun, 14 Oct 2007 18:34:50 +0000 (+0100)
Subject: fs/partitions/sun.c endianness annotations
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b1519d047ca55406e0fc3dd2b8de266f971ea210;p=linux-beck.git

fs/partitions/sun.c endianness annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/partitions/sun.c b/fs/partitions/sun.c
index 794118da4ef3..c95e6a62c01d 100644
--- a/fs/partitions/sun.c
+++ b/fs/partitions/sun.c
@@ -95,8 +95,8 @@ int sun_partition(struct parsed_partitions *state, struct block_device *bdev)
 	 * So that old Linux-Sun partitions continue to work,
 	 * alow the VTOC to be used under the additional condition ...
 	 */
-	use_vtoc = use_vtoc || !(label->vtoc.sanity |
-				 label->vtoc.version | label->vtoc.nparts);
+	use_vtoc = use_vtoc || !(label->vtoc.sanity ||
+				 label->vtoc.version || label->vtoc.nparts);
 	spc = be16_to_cpu(label->ntrks) * be16_to_cpu(label->nsect);
 	for (i = 0; i < nparts; i++, p++) {
 		unsigned long st_sector;