[evdev PATCH] Fix copy-paste error when probing type name

Peter Hutterer peter.hutterer at who-t.net
Sun May 10 15:21:28 PDT 2009


On Sun, May 10, 2009 at 08:29:21AM -0700, Dan Nicholson wrote:
> A minor copy and paste error was introduced in 71e9a69e leaving an "if"
> where an "else if" should be. Without this, any device configured as
> XI_TOUCHPAD or XI_TABLET will end up having the type_name reset to
> either XI_TOUCHSCREEN or XI_MOUSE.
> 
> Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
> ---
>  src/evdev.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/src/evdev.c b/src/evdev.c
> index 56061a3..922d37f 100644
> --- a/src/evdev.c
> +++ b/src/evdev.c
> @@ -1576,7 +1576,7 @@ EvdevProbe(InputInfoPtr pInfo)
>  	} else if (TestBit(ABS_PRESSURE, pEvdev->abs_bitmask)) {
>  	    xf86Msg(X_INFO, "%s: Configuring as tablet\n", pInfo->name);
>  	    pInfo->type_name = XI_TABLET;
> -        } if (pEvdev->flags & EVDEV_TOUCHSCREEN) {
> +        } else if (pEvdev->flags & EVDEV_TOUCHSCREEN) {
>              xf86Msg(X_INFO, "%s: Configuring as touchscreen\n", pInfo->name);
>              pInfo->type_name = XI_TOUCHSCREEN;
>  	} else {
> -- 
> 1.6.0.6

Applied, pushed. Thanks for the patch!
 
Cheers,
  Peter


More information about the xorg-devel mailing list