diff options
Diffstat (limited to 'fs/hfs')
| -rw-r--r-- | fs/hfs/super.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/hfs/super.c b/fs/hfs/super.c index 32de44ed0021..8cf67974adf6 100644 --- a/fs/hfs/super.c +++ b/fs/hfs/super.c | |||
| @@ -297,7 +297,8 @@ static int parse_options(char *options, struct hfs_sb_info *hsb) | |||
| 297 | return 0; | 297 | return 0; |
| 298 | } | 298 | } |
| 299 | p = match_strdup(&args[0]); | 299 | p = match_strdup(&args[0]); |
| 300 | hsb->nls_disk = load_nls(p); | 300 | if (p) |
| 301 | hsb->nls_disk = load_nls(p); | ||
| 301 | if (!hsb->nls_disk) { | 302 | if (!hsb->nls_disk) { |
| 302 | printk(KERN_ERR "hfs: unable to load codepage \"%s\"\n", p); | 303 | printk(KERN_ERR "hfs: unable to load codepage \"%s\"\n", p); |
| 303 | kfree(p); | 304 | kfree(p); |
| @@ -311,7 +312,8 @@ static int parse_options(char *options, struct hfs_sb_info *hsb) | |||
| 311 | return 0; | 312 | return 0; |
| 312 | } | 313 | } |
| 313 | p = match_strdup(&args[0]); | 314 | p = match_strdup(&args[0]); |
| 314 | hsb->nls_io = load_nls(p); | 315 | if (p) |
| 316 | hsb->nls_io = load_nls(p); | ||
| 315 | if (!hsb->nls_io) { | 317 | if (!hsb->nls_io) { |
| 316 | printk(KERN_ERR "hfs: unable to load iocharset \"%s\"\n", p); | 318 | printk(KERN_ERR "hfs: unable to load iocharset \"%s\"\n", p); |
| 317 | kfree(p); | 319 | kfree(p); |