git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fs: Make unload_nls() NULL pointer safe
[pandora-kernel.git]
/
fs
/
ncpfs
/
ioctl.c
diff --git
a/fs/ncpfs/ioctl.c
b/fs/ncpfs/ioctl.c
index
53a7ed7
..
0d58caf
100644
(file)
--- a/
fs/ncpfs/ioctl.c
+++ b/
fs/ncpfs/ioctl.c
@@
-223,10
+223,8
@@
ncp_set_charsets(struct ncp_server* server, struct ncp_nls_ioctl __user *arg)
oldset_io = server->nls_io;
server->nls_io = iocharset;
- if (oldset_cp)
- unload_nls(oldset_cp);
- if (oldset_io)
- unload_nls(oldset_io);
+ unload_nls(oldset_cp);
+ unload_nls(oldset_io);
return 0;
}