[PATCH aiptek 14/18] Use pInfo->name instead of dev->identifier

[Peter Hutterer]

On Wed, Dec 01, 2010 at 09:56:58PM -0500, Trevor Woerner wrote:
> After applying this patch there's still one left at line 2050 of
> src/xf86Aiptek.c is this significant?

yes, pre ABI 12 the driver had to assign the name itself. This line then
goes away with ABI 12. so that one left is valid.

Having said that, the error with invalid types would yield garbage here because it isn't set yet. So this diff below needs to be squashed into 14/18 and then reversed in 18/18.

diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index 7b64630..9bb1b9c 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -2032,7 +2032,7 @@ xf86AiptekInit(InputDriverPtr    drv,
     {
         xf86Msg(X_ERROR, "%s: No type or invalid type specified.\n"
                   "Must be one of 'stylus', 'cursor', or 'eraser'\n",
-                  pInfo->name);
+                  dev->identifier);
     }
 
     if(!pInfo)

good spotting, thanks.

Cheers,
  Peter