1 files changed, 3 insertions, 12 deletions

diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index 1865089ff41a..89c1be225fda 100644
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -79,7 +79,7 @@ out:
 static void slirp_close(int fd, void *data)
 {
         struct slirp_data *pri = data;
-        int status,err;
+        int err;
 
         close(fd);
         close(pri->slave);
@@ -98,18 +98,9 @@ static void slirp_close(int fd, void *data)
                        "(%d)\n", pri->pid, errno);
         }
 #endif
-
-        CATCH_EINTR(err = waitpid(pri->pid, &status, WNOHANG));
-        if (err < 0) {
-                printk(UM_KERN_ERR "slirp_close: waitpid returned %d\n", errno);
-                return;
-        }
-
-        if (err == 0) {
-                printk(UM_KERN_ERR "slirp_close: process %d has not exited\n",
-                       pri->pid);
+        err = helper_wait(pri->pid, 1, "slirp_close");
+        if (err < 0)
                 return;
-        }
 
         pri->pid = -1;
 }