[PATCH evdev 2/2] Reshuffle to avoid the need for XI86_CONFIGURED.

Benjamin Tissoires tissoire at cena.fr
Thu Oct 28 04:54:07 PDT 2010



Le 28/10/2010 05:11, Peter Hutterer a écrit :
> On Tue, Oct 26, 2010 at 10:11:17AM +1000, Peter Hutterer wrote:
>> Signed-off-by: Peter Hutterer<peter.hutterer at who-t.net>
>> ---
>>   src/evdev.c |   22 +++++++++++++---------
>>   1 files changed, 13 insertions(+), 9 deletions(-)
>>
>> diff --git a/src/evdev.c b/src/evdev.c
>> index 018843f..940f24d 100644
>> --- a/src/evdev.c
>> +++ b/src/evdev.c
>> @@ -63,7 +63,6 @@
>
> [...]
>
>> @@ -2214,7 +2214,11 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
>>       xf86ProcessCommonOptions(pInfo, pInfo->options);
>>
>>       if (NewEvdevPreInit(drv, pInfo, flags) == Success)
>> +    {
>> +        pInfo->flags = XI86_CONFIGURED;
>>           return pInfo;
>> +    }
>> +
>
> ftr, this should be pInfo->flags |= XI86_CONFIGURED;
> who would have thought that = vs. |= makes a difference :)

Oops, I was so concerned by the undef that I didn't catch that.

Sorry Peter,

Cheers,
Benjamin

>
>>
>>       xf86DeleteInput(pInfo, 0);
>>       return NULL;
>> --
>> 1.7.2.3
>
>
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel


More information about the xorg-devel mailing list