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

[linux-drm-fsl-dcu.git] / kernel / kmod.c

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 7dc7a9dad6acc7ffb45439d28ba3b140561c1f54..8d2bea09a4ec9b44f86f5574defa6af2a043917d 100644 (file)
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -311,14 +311,14 @@ int call_usermodehelper_pipe(char *path, char **argv, char **envp,
                return 0;
 
        f = create_write_pipe();
-       if (!f)
-               return -ENOMEM;
+       if (IS_ERR(f))
+               return PTR_ERR(f);
        *filp = f;
 
        f = create_read_pipe(f);
-       if (!f) {
+       if (IS_ERR(f)) {
                free_write_pipe(*filp);
-               return -ENOMEM;
+               return PTR_ERR(f);
        }
        sub_info.stdin = f;