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

Peter Hutterer peter.hutterer at who-t.net
Wed Oct 27 20:11:45 PDT 2010


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 :)

>  
>      xf86DeleteInput(pInfo, 0);
>      return NULL;
> -- 
> 1.7.2.3


 


More information about the xorg-devel mailing list