Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / fs / nls / nls_base.c

diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
index b25c218671b3d9a2062321c0651904f7f23c88e4..44a88a9fa2c87724408fb1268cb46b84b87b3746 100644 (file)
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -270,7 +270,8 @@ struct nls_table *load_nls(char *charset)
 
 void unload_nls(struct nls_table *nls)
 {
-       module_put(nls->owner);
+       if (nls)
+               module_put(nls->owner);
 }
 
 static const wchar_t charset2uni[256] = {