On Tue, Sep 25, 2012 at 10:28:07AM -0700, Jason Gerecke wrote:
> Commit def7b5fd changed how wcmIsHotpluggedDevice handles null values,
> with the result that a device with no "_source" specified would be
> interpreted as having been hotplugged. This restores the original
> behavior.
>
> Signed-off-by: Jason Gerecke <killert...@gmail.com>
> ---
> src/wcmConfig.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/wcmConfig.c b/src/wcmConfig.c
> index 24ec85b..93c947c 100644
> --- a/src/wcmConfig.c
> +++ b/src/wcmConfig.c
> @@ -442,7 +442,7 @@ static void wcmLinkTouchAndPen(InputInfoPtr pInfo)
> static int wcmIsHotpluggedDevice(InputInfoPtr pInfo)
> {
> char *source = xf86CheckStrOption(pInfo->options, "_source", NULL);
> - return (!source || !strcmp(source, "_driver/wacom"));
> + return (source && !strcmp(source, "_driver/wacom"));
same thing here, just use the dflt argument and you skip the null check
completely.
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> with the change.
Cheers,
Peter
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
