2008-10-18 12:52:28

by Steven Noonan

[permalink] [raw]
Subject: appletouch regression

It seems that the appletouch driver is (sporadically) not detecting my
Apple Trackpad anymore on Linus' current tree (2.6.27-05577-g0cfd810).
When it is misbehaving, it doesn't have any /dev/input/event* entry
that corresponds to the input from appletouch, and dmesg -should- show
the following, as 2.6.27.1 does, but does not:

appletouch: Geyser mode initialized.
input: appletouch as /class/input/input4
usbcore: registered new interface driver appletouch
appletouch: 17" model detected

On the current tree, occasionally all I get is:

usbcore: registered new interface driver appletouch

It's unfortunately a touchy issue, as it only -occasionally- happens.
A bisection will be a pain in the butt, but I'm starting it right now
anyway.

- Steven


2008-10-18 14:06:45

by Sven Anders

[permalink] [raw]
Subject: Re: appletouch regression

Steven Noonan schrieb:
> It seems that the appletouch driver is (sporadically) not detecting my
> Apple Trackpad anymore on Linus' current tree (2.6.27-05577-g0cfd810).
> When it is misbehaving, it doesn't have any /dev/input/event* entry
> that corresponds to the input from appletouch, and dmesg -should- show
> the following, as 2.6.27.1 does, but does not:
>
> appletouch: Geyser mode initialized.
> input: appletouch as /class/input/input4
> usbcore: registered new interface driver appletouch
> appletouch: 17" model detected
>
> On the current tree, occasionally all I get is:
>
> usbcore: registered new interface driver appletouch
>
> It's unfortunately a touchy issue, as it only -occasionally- happens.
> A bisection will be a pain in the butt, but I'm starting it right now
> anyway.

Hmm, strange...

I didn't change anything in the initialization routines. But I will take a look
into the changes, if something is missing or wrong...

Regards
Sven
--
Sven Anders <[email protected]> () Ascii Ribbon Campaign
/\ Support plain text e-mail
ANDURAS service solutions AG
Innstra?e 71 - 94036 Passau - Germany
Web: http://www.anduras.de - Tel: +49 (0)851-4 90 50-0 - Fax: +49 (0)851-4 90 50-55

Rechtsform: Aktiengesellschaft - Sitz: Passau - Amtsgericht Passau HRB 6032
Mitglieder des Vorstands: Sven Anders, Marcus Junker
Vorsitzender des Aufsichtsrats: Mark Peters


Attachments:
anders.vcf (338.00 B)
signature.asc (252.00 B)
OpenPGP digital signature
Download all attachments

2008-10-18 16:44:18

by Steven Noonan

[permalink] [raw]
Subject: Re: appletouch regression

2008/10/18 Sven Anders <[email protected]>:
> Steven Noonan schrieb:
>> It seems that the appletouch driver is (sporadically) not detecting my
>> Apple Trackpad anymore on Linus' current tree (2.6.27-05577-g0cfd810).
>> When it is misbehaving, it doesn't have any /dev/input/event* entry
>> that corresponds to the input from appletouch, and dmesg -should- show
>> the following, as 2.6.27.1 does, but does not:
>>
>> appletouch: Geyser mode initialized.
>> input: appletouch as /class/input/input4
>> usbcore: registered new interface driver appletouch
>> appletouch: 17" model detected
>>
>> On the current tree, occasionally all I get is:
>>
>> usbcore: registered new interface driver appletouch
>>
>> It's unfortunately a touchy issue, as it only -occasionally- happens.
>> A bisection will be a pain in the butt, but I'm starting it right now
>> anyway.
>
> Hmm, strange...
>
> I didn't change anything in the initialization routines. But I will take a look
> into the changes, if something is missing or wrong...
>

I am pretty sure the two patches recently submitted by you are not
guilty (I tried reverting both of them, which had no effect).

Still working on the git-bisect. Fell asleep in the middle of it last night. O.o

- Steven

2008-10-18 17:29:50

by Justin P. Mattock

[permalink] [raw]
Subject: Re: appletouch regression

On Sat, Oct 18, 2008 at 9:44 AM, Steven Noonan <[email protected]> wrote:
> 2008/10/18 Sven Anders <[email protected]>:
>> Steven Noonan schrieb:
>>> It seems that the appletouch driver is (sporadically) not detecting my
>>> Apple Trackpad anymore on Linus' current tree (2.6.27-05577-g0cfd810).
>>> When it is misbehaving, it doesn't have any /dev/input/event* entry
>>> that corresponds to the input from appletouch, and dmesg -should- show
>>> the following, as 2.6.27.1 does, but does not:
>>>
>>> appletouch: Geyser mode initialized.
>>> input: appletouch as /class/input/input4
>>> usbcore: registered new interface driver appletouch
>>> appletouch: 17" model detected
>>>
>>> On the current tree, occasionally all I get is:
>>>
>>> usbcore: registered new interface driver appletouch
>>>
>>> It's unfortunately a touchy issue, as it only -occasionally- happens.
>>> A bisection will be a pain in the butt, but I'm starting it right now
>>> anyway.
>>
>> Hmm, strange...
>>
>> I didn't change anything in the initialization routines. But I will take a look
>> into the changes, if something is missing or wrong...
>>
>
> I am pretty sure the two patches recently submitted by you are not
> guilty (I tried reverting both of them, which had no effect).
>
> Still working on the git-bisect. Fell asleep in the middle of it last night. O.o
>
> - Steven
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

I too have a lifeless apple touchpad,
not sure when this started,due to never really using
it unless I'm in a remote location.

--
Justin P. Mattock

2008-10-18 18:34:43

by Steven Noonan

[permalink] [raw]
Subject: Re: appletouch regression

On Sat, Oct 18, 2008 at 10:29 AM, Justin Mattock
<[email protected]> wrote:
> On Sat, Oct 18, 2008 at 9:44 AM, Steven Noonan <[email protected]> wrote:
>> 2008/10/18 Sven Anders <[email protected]>:
>>> Steven Noonan schrieb:
>>>> It seems that the appletouch driver is (sporadically) not detecting my
>>>> Apple Trackpad anymore on Linus' current tree (2.6.27-05577-g0cfd810).
>>>> When it is misbehaving, it doesn't have any /dev/input/event* entry
>>>> that corresponds to the input from appletouch, and dmesg -should- show
>>>> the following, as 2.6.27.1 does, but does not:
>>>>
>>>> appletouch: Geyser mode initialized.
>>>> input: appletouch as /class/input/input4
>>>> usbcore: registered new interface driver appletouch
>>>> appletouch: 17" model detected
>>>>
>>>> On the current tree, occasionally all I get is:
>>>>
>>>> usbcore: registered new interface driver appletouch
>>>>
>>>> It's unfortunately a touchy issue, as it only -occasionally- happens.
>>>> A bisection will be a pain in the butt, but I'm starting it right now
>>>> anyway.
>>>
>>> Hmm, strange...
>>>
>>> I didn't change anything in the initialization routines. But I will take a look
>>> into the changes, if something is missing or wrong...
>>>
>>
>> I am pretty sure the two patches recently submitted by you are not
>> guilty (I tried reverting both of them, which had no effect).
>>
>> Still working on the git-bisect. Fell asleep in the middle of it last night. O.o
>>
>> - Steven
>
> I too have a lifeless apple touchpad,
> not sure when this started,due to never really using
> it unless I'm in a remote location.
>

I finished the git-bisect. Here's the log:
# bad: [0cfd8103] Merge git://git.kernel.org/pub/scm/linux/kernel/gi
# good: [3fa8749e] Linux 2.6.27
# good: [56c5d900] Merge branch 'master' of master.kernel.org:/pub/sc
# good: [acd15a83] Merge branch 'upstream-linus' of git://git.kernel.
# bad: [c8d8a232] Merge git://git.kernel.org/pub/scm/linux/kernel/gi
# bad: [f055663c] checkpatch: report the correct lines for single st
# good: [6dc64725] Merge commit 'origin'
# bad: [08da6f1b] MIPS: Kill unused <asm/debug.h> inclusions
# bad: [79575019] HID: convert to dev_* prints
# bad: [980a3da6] HID: move samsung quirks
# bad: [78a849a6] HID: move microsoft quirks
# bad: [022e8c4d] HID: move usage input mapping to hid.h
# good: [85cdaf52] HID: make a bus from hid code
# bad: [990436a7] HID: move ids into separate file
# bad: [c500c971] HID: hid, make parsing event driven

So the bad commit seems to be:

commit c500c9714011edab021591340042787722db9cf0
Author: Jiri Slaby <[email protected]>
Date: Fri May 16 11:49:16 2008 +0200

HID: hid, make parsing event driven

Next step for complete hid bus, this patch includes:
- call parser either from probe or from hid-core if there is no probe.
- add ll_driver structure and centralize some stuff there (open, close...)
- split and merge usb_hid_configure and hid_probe into several functions
to allow hooks/fixes between them

Signed-off-by: Jiri Slaby <[email protected]>
Signed-off-by: Jiri Kosina <[email protected]>

Any ideas, gentlemen?

- Steven

2008-10-18 19:57:38

by Jiri Slaby

[permalink] [raw]
Subject: Re: appletouch regression

Steven Noonan wrote:
> On Sat, Oct 18, 2008 at 10:29 AM, Justin Mattock
> <[email protected]> wrote:
>> On Sat, Oct 18, 2008 at 9:44 AM, Steven Noonan <[email protected]> wrote:
>>> 2008/10/18 Sven Anders <[email protected]>:
>>>> Steven Noonan schrieb:
>>>>> It seems that the appletouch driver is (sporadically) not detecting my
>>>>> Apple Trackpad anymore on Linus' current tree (2.6.27-05577-g0cfd810).
>>>>> When it is misbehaving, it doesn't have any /dev/input/event* entry
>>>>> that corresponds to the input from appletouch, and dmesg -should- show
>>>>> the following, as 2.6.27.1 does, but does not:
>>>>>
>>>>> appletouch: Geyser mode initialized.
>>>>> input: appletouch as /class/input/input4
>>>>> usbcore: registered new interface driver appletouch
>>>>> appletouch: 17" model detected
>>>>>
>>>>> On the current tree, occasionally all I get is:
>>>>>
>>>>> usbcore: registered new interface driver appletouch
[...]
> Any ideas, gentlemen?

Yeah, I see the problem. The device is grabbed by the hid bus and not
released even if apple driver says ENODEV (this is expected behaviour
and noted in the driver).

Could you try this patch? (Not ready for merge, it needs to be cleaned
up.)

---
drivers/hid/hid-core.c | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 8a7d9db..94cf1db 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1539,6 +1539,34 @@ static const struct hid_device_id hid_ignore_list[] = {
{ }
};

+static const struct hid_device_id hid_mouse_ignore_list[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
+ { }
+};
+
+#include <linux/usb.h>
+
static bool hid_ignore(struct hid_device *hdev)
{
switch (hdev->vendor) {
@@ -1555,6 +1583,12 @@ static bool hid_ignore(struct hid_device *hdev)
break;
}

+ if (hdev->bus == BUS_USB && to_usb_interface(hdev->dev.parent)->
+ cur_altsetting->desc.bInterfaceProtocol ==
+ USB_INTERFACE_PROTOCOL_MOUSE &&
+ hid_match_id(hdev, hid_mouse_ignore_list))
+ return true;
+
return !!hid_match_id(hdev, hid_ignore_list);
}

--
1.6.0.2

2008-10-18 20:33:15

by Justin P. Mattock

[permalink] [raw]
Subject: Re: appletouch regression

On Sat, Oct 18, 2008 at 12:56 PM, Jiri Slaby <[email protected]> wrote:
> Steven Noonan wrote:
>> On Sat, Oct 18, 2008 at 10:29 AM, Justin Mattock
>> <[email protected]> wrote:
>>> On Sat, Oct 18, 2008 at 9:44 AM, Steven Noonan <[email protected]> wrote:
>>>> 2008/10/18 Sven Anders <[email protected]>:
>>>>> Steven Noonan schrieb:
>>>>>> It seems that the appletouch driver is (sporadically) not detecting my
>>>>>> Apple Trackpad anymore on Linus' current tree (2.6.27-05577-g0cfd810).
>>>>>> When it is misbehaving, it doesn't have any /dev/input/event* entry
>>>>>> that corresponds to the input from appletouch, and dmesg -should- show
>>>>>> the following, as 2.6.27.1 does, but does not:
>>>>>>
>>>>>> appletouch: Geyser mode initialized.
>>>>>> input: appletouch as /class/input/input4
>>>>>> usbcore: registered new interface driver appletouch
>>>>>> appletouch: 17" model detected
>>>>>>
>>>>>> On the current tree, occasionally all I get is:
>>>>>>
>>>>>> usbcore: registered new interface driver appletouch
> [...]
>> Any ideas, gentlemen?
>
> Yeah, I see the problem. The device is grabbed by the hid bus and not
> released even if apple driver says ENODEV (this is expected behaviour
> and noted in the driver).
>
> Could you try this patch? (Not ready for merge, it needs to be cleaned
> up.)
>
> ---
> drivers/hid/hid-core.c | 34 ++++++++++++++++++++++++++++++++++
> 1 files changed, 34 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 8a7d9db..94cf1db 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1539,6 +1539,34 @@ static const struct hid_device_id hid_ignore_list[] = {
> { }
> };
>
> +static const struct hid_device_id hid_mouse_ignore_list[] = {
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
> + { }
> +};
> +
> +#include <linux/usb.h>
> +
> static bool hid_ignore(struct hid_device *hdev)
> {
> switch (hdev->vendor) {
> @@ -1555,6 +1583,12 @@ static bool hid_ignore(struct hid_device *hdev)
> break;
> }
>
> + if (hdev->bus == BUS_USB && to_usb_interface(hdev->dev.parent)->
> + cur_altsetting->desc.bInterfaceProtocol ==
> + USB_INTERFACE_PROTOCOL_MOUSE &&
> + hid_match_id(hdev, hid_mouse_ignore_list))
> + return true;
> +
> return !!hid_match_id(hdev, hid_ignore_list);
> }
>
> --
> 1.6.0.2
>
>

Applied and can confirm
my appletouchpad is alive and reacting,
Thanks a lot man.

regards;

--
Justin P. Mattock

2008-10-18 20:44:20

by Steven Noonan

[permalink] [raw]
Subject: Re: appletouch regression

On Sat, Oct 18, 2008 at 1:32 PM, Justin Mattock <[email protected]> wrote:
> On Sat, Oct 18, 2008 at 12:56 PM, Jiri Slaby <[email protected]> wrote:
>> Steven Noonan wrote:
>>> On Sat, Oct 18, 2008 at 10:29 AM, Justin Mattock
>>> <[email protected]> wrote:
>>>> On Sat, Oct 18, 2008 at 9:44 AM, Steven Noonan <[email protected]> wrote:
>>>>> 2008/10/18 Sven Anders <[email protected]>:
>>>>>> Steven Noonan schrieb:
>>>>>>> It seems that the appletouch driver is (sporadically) not detecting my
>>>>>>> Apple Trackpad anymore on Linus' current tree (2.6.27-05577-g0cfd810).
>>>>>>> When it is misbehaving, it doesn't have any /dev/input/event* entry
>>>>>>> that corresponds to the input from appletouch, and dmesg -should- show
>>>>>>> the following, as 2.6.27.1 does, but does not:
>>>>>>>
>>>>>>> appletouch: Geyser mode initialized.
>>>>>>> input: appletouch as /class/input/input4
>>>>>>> usbcore: registered new interface driver appletouch
>>>>>>> appletouch: 17" model detected
>>>>>>>
>>>>>>> On the current tree, occasionally all I get is:
>>>>>>>
>>>>>>> usbcore: registered new interface driver appletouch
>> [...]
>>> Any ideas, gentlemen?
>>
>> Yeah, I see the problem. The device is grabbed by the hid bus and not
>> released even if apple driver says ENODEV (this is expected behaviour
>> and noted in the driver).
>>
>> Could you try this patch? (Not ready for merge, it needs to be cleaned
>> up.)
>>
>> ---
>> drivers/hid/hid-core.c | 34 ++++++++++++++++++++++++++++++++++
>> 1 files changed, 34 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
>> index 8a7d9db..94cf1db 100644
>> --- a/drivers/hid/hid-core.c
>> +++ b/drivers/hid/hid-core.c
>> @@ -1539,6 +1539,34 @@ static const struct hid_device_id hid_ignore_list[] = {
>> { }
>> };
>>
>> +static const struct hid_device_id hid_mouse_ignore_list[] = {
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
>> + { }
>> +};
>> +
>> +#include <linux/usb.h>
>> +
>> static bool hid_ignore(struct hid_device *hdev)
>> {
>> switch (hdev->vendor) {
>> @@ -1555,6 +1583,12 @@ static bool hid_ignore(struct hid_device *hdev)
>> break;
>> }
>>
>> + if (hdev->bus == BUS_USB && to_usb_interface(hdev->dev.parent)->
>> + cur_altsetting->desc.bInterfaceProtocol ==
>> + USB_INTERFACE_PROTOCOL_MOUSE &&
>> + hid_match_id(hdev, hid_mouse_ignore_list))
>> + return true;
>> +
>> return !!hid_match_id(hdev, hid_ignore_list);
>> }
>>
>> --
>> 1.6.0.2
>>
>>
>
> Applied and can confirm
> my appletouchpad is alive and reacting,
> Thanks a lot man.
>
> regards;
>
> --
> Justin P. Mattock
>

Works here.

Tested-by: Steven Noonan <[email protected]>

2008-10-18 22:52:22

by Jiri Kosina

[permalink] [raw]
Subject: Re: appletouch regression

On Sat, 18 Oct 2008, Jiri Slaby wrote:

> Yeah, I see the problem. The device is grabbed by the hid bus and not
> released even if apple driver says ENODEV (this is expected behaviour
> and noted in the driver).
> Could you try this patch? (Not ready for merge, it needs to be cleaned
> up.)

Will you please send me polished patch with changelog and Signed-off-by,
so that I can queue it in my upstream-fixes branch that will go to Linus
shortly?

Thanks,

--
Jiri Kosina
SUSE Labs