Merge branch 'smsc47b397-new-id' into release

[linux-2.6-omap-h63xx.git] / arch / um / drivers / slip_user.c

diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index 5f06204d68719d2ac0fba7bb7a9a8e8b38bfcee3..8b80505a3fb0117ed35676de600cce0b11b2f721 100644 (file)
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -77,7 +77,7 @@ static int slip_tramp(char **argv, int fd)
 {
        struct slip_pre_exec_data pe_data;
        char *output;
-       int status, pid, fds[2], err, output_len;
+       int pid, fds[2], err, output_len;
 
        err = os_pipe(fds, 1, 0);
        if (err < 0) {
@@ -109,15 +109,7 @@ static int slip_tramp(char **argv, int fd)
        read_output(fds[0], output, output_len);
        printk("%s", output);
 
-       CATCH_EINTR(err = waitpid(pid, &status, 0));
-       if (err < 0)
-               err = errno;
-       else if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
-               printk(UM_KERN_ERR "'%s' didn't exit with status 0\n", argv[0]);
-               err = -EINVAL;
-       }
-       else err = 0;
-
+       err = helper_wait(pid);
        close(fds[0]);
 
 out_free: