lkml.org 
[lkml]   [2012]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 1/2] Input: serio_raw - cosmetic fixes
On Mon, Jan 9, 2012 at 4:24 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> Hi Che-Liang,
>
> On Fri, Jan 06, 2012 at 07:03:14PM +0800, Che-Liang Chiou wrote:
>> Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
>> ---
>>  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.

Yeah I was wondering maybe you are going to make use of mask
somewhere. But still the patch below is quite strange. To my
understanding the mask is still not used; It is a local variable that
not does not make any side effect. Do you intend to use that mask on
any global state or return value?

> Thanks.
>
> --
> Dmitry
>
> Input: serio-raw - really signal HUP upon disconnect
>
> From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>
> 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 <clchiou@chromium.org>
> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> ---
>
>  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;

It seems that mask is a local variable that seems have no effect to
any global state?

>        return 0;
>  }
--
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/

\
 
 \ /
  Last update: 2012-01-10 09:27    [W:0.068 / U:0.040 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site