diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-06 16:34:21 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-06 16:34:21 -0500 |
| commit | 25da0974601fc8096461f3d3f7ca3aab8e79adfb (patch) | |
| tree | f9b3c1bfbc63fdb6a94e82177b8c3ae891125422 /kernel/module.c | |
| parent | 036d25f79ddfbc9878da24ef8e468a6d22caa605 (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Auto-update from upstream
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c index 2ea929d51ad0..4b06bbad49c2 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -1854,8 +1854,7 @@ static struct module *load_module(void __user *umod, | |||
| 1854 | kfree(args); | 1854 | kfree(args); |
| 1855 | free_hdr: | 1855 | free_hdr: |
| 1856 | vfree(hdr); | 1856 | vfree(hdr); |
| 1857 | if (err < 0) return ERR_PTR(err); | 1857 | return ERR_PTR(err); |
| 1858 | else return ptr; | ||
| 1859 | 1858 | ||
| 1860 | truncated: | 1859 | truncated: |
| 1861 | printk(KERN_ERR "Module len %lu truncated\n", len); | 1860 | printk(KERN_ERR "Module len %lu truncated\n", len); |