diff --git a/[refs] b/[refs]
index 03cc9d2cc57a..976264eba772 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 947a50679570ef7a66e3e3107e95943a1cb14d08
+refs/heads/master: 1a70d6529ad9f5978af846440f8a809784d6e813
diff --git a/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c
index 005fb315477c..79a01d35a783 100644
--- a/trunk/fs/cifs/cifssmb.c
+++ b/trunk/fs/cifs/cifssmb.c
@@ -477,7 +477,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
 			server->capabilities = CAP_MPX_MODE;
 		}
 		tmp = (__s16)le16_to_cpu(rsp->ServerTimeZone);
-		if (tmp == 0xffff) {
+		if (tmp == -1) {
 			/* OS/2 often does not set timezone therefore
 			 * we must use server time to calc time zone.
 			 * Could deviate slightly from the right zone.