Merge with /usr/src/ntfs-2.6.git

[linux-2.6] / fs / udf / udftime.c

diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c
index c2634bda6b5030419d51b71e062b92e28addf8ee..457a8fe285751d73bd3f052b21532b1538c988dd 100644 (file)
--- a/fs/udf/udftime.c
+++ b/fs/udf/udftime.c
@@ -103,7 +103,7 @@ udf_stamp_to_time(time_t *dest, long *dest_usec, kernel_timestamp src)
                offset = 0;
 
        if ((src.year < EPOCH_YEAR) ||
-               (src.year > EPOCH_YEAR+MAX_YEAR_SECONDS))
+               (src.year >= EPOCH_YEAR+MAX_YEAR_SECONDS))
        {
                *dest = -1;
                *dest_usec = -1;