Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756828AbXLWUBV (ORCPT ); Sun, 23 Dec 2007 15:01:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752885AbXLWUBH (ORCPT ); Sun, 23 Dec 2007 15:01:07 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:52235 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751556AbXLWUBG (ORCPT ); Sun, 23 Dec 2007 15:01:06 -0500 To: torvalds@linux-foundation.org Subject: [PATCH] uml: user of helper_wait() got missed when it got extra arguments Cc: jdike@addtoit.com, linux-kernel@vger.kernel.org Message-Id: From: Al Viro Date: Sun, 23 Dec 2007 20:01:04 +0000 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1073 Lines: 35 Signed-off-by: Al Viro --- arch/um/drivers/harddog_user.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c index b56f8e0..448ba59 100644 --- a/arch/um/drivers/harddog_user.c +++ b/arch/um/drivers/harddog_user.c @@ -79,14 +79,14 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock) n = read(in_fds[0], &c, sizeof(c)); if (n == 0) { printk("harddog_open - EOF on watchdog pipe\n"); - helper_wait(pid); + helper_wait(pid, 1, NULL); err = -EIO; goto out_close_out; } else if (n < 0) { printk("harddog_open - read of watchdog pipe failed, " "err = %d\n", errno); - helper_wait(pid); + helper_wait(pid, 1, NULL); err = n; goto out_close_out; } -- 1.5.3.GIT -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/