diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 137572bb7037564095ea33191d2bf8cb4c346db5..3f5a7a85c9c2604d5ca9a7f720e7db551731c1ee 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2205,8 +2205,8 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
 		data->nfs_server.addrlen);
 
 	/* overwrite those values with any that were specified */
-	error = nfs_parse_mount_options((char *)options, data);
-	if (error < 0)
+	error = -EINVAL;
+	if (!nfs_parse_mount_options((char *)options, data))
 		goto out;
 
 	/*