1 files changed, 3 insertions, 2 deletions

diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c
index 458cf463047b..46ad0ef8b4cc 100644
--- a/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
@@ -455,7 +455,7 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data)
         struct hpfs_sb_info *sbi = hpfs_sb(s);
         char *new_opts = kstrdup(data, GFP_KERNEL);
 
-        if (!new_opts)
+        if (data && !new_opts)
                 return -ENOMEM;
 
         sync_filesystem(s);
@@ -493,7 +493,8 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data)
 
         if (!(*flags & MS_RDONLY)) mark_dirty(s, 1);
 
-        replace_mount_options(s, new_opts);
+        if (new_opts)
+                replace_mount_options(s, new_opts);
 
         hpfs_unlock(s);
         return 0;