From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754874Ab2AIIYV (ORCPT ); Mon, 9 Jan 2012 03:24:21 -0500 Received: from mail-tul01m020-f174.google.com ([209.85.214.174]:59803 "EHLO mail-tul01m020-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751466Ab2AIIYT (ORCPT ); Mon, 9 Jan 2012 03:24:19 -0500 Date: Mon, 9 Jan 2012 00:24:12 -0800 From: Dmitry Torokhov To: Che-Liang Chiou Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] Input: serio_raw - cosmetic fixes Message-ID: <20120109082412.GC4049@core.coreip.homeip.net> References: <1325847795-30486-1-git-send-email-clchiou@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1325847795-30486-1-git-send-email-clchiou@chromium.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Che-Liang, On Fri, Jan 06, 2012 at 07:03:14PM +0800, Che-Liang Chiou wrote: > Signed-off-by: Che-Liang Chiou > --- > drivers/input/serio/serio_raw.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c > index 4d4cd14..a935c38 100644 > --- a/drivers/input/serio/serio_raw.c > +++ b/drivers/input/serio/serio_raw.c > @@ -220,7 +220,7 @@ static ssize_t serio_raw_write(struct file *file, const char __user *buffer, > goto out; > } > written++; > - }; > + } > I applied this chunk, thanks. > out: > mutex_unlock(&serio_raw_mutex); > @@ -231,11 +231,9 @@ static unsigned int serio_raw_poll(struct file *file, poll_table *wait) > { > struct serio_raw_client *client = file->private_data; > struct serio_raw *serio_raw = client->serio_raw; > - unsigned int mask; > > poll_wait(file, &serio_raw->wait, wait); > > - mask = serio_raw->dead ? POLLHUP | POLLERR : POLLOUT | POLLWRNORM; > if (serio_raw->head != serio_raw->tail) > return POLLIN | POLLRDNORM; > This however is not quite correct. I will be applying the patch below instead. Thanks. -- Dmitry Input: serio-raw - really signal HUP upon disconnect From: Dmitry Torokhov Commit 8c1c10d5706bbb3b41cb4a5578339d67d3eeffc2 attempted to signal POLLHUP | POLLERR condition when polling disconnected device, unfortunately it did not do it quite correctly. Reported-by: Che-Liang Chiou Signed-off-by: Dmitry Torokhov --- drivers/input/serio/serio_raw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c index ca78a89..c2c6ad8 100644 --- a/drivers/input/serio/serio_raw.c +++ b/drivers/input/serio/serio_raw.c @@ -237,7 +237,7 @@ static unsigned int serio_raw_poll(struct file *file, poll_table *wait) mask = serio_raw->dead ? POLLHUP | POLLERR : POLLOUT | POLLWRNORM; if (serio_raw->head != serio_raw->tail) - return POLLIN | POLLRDNORM; + mask |= POLLIN | POLLRDNORM; return 0; }