Re: [Bug #10825] appletouch after wakeup

[Justin Mattock]

On Mon, Jun 9, 2008 at 10:04 PM, Justin Mattock <justinmattock@xxxxxxxxx> wrote:
> On Mon, Jun 9, 2008 at 9:16 PM, Oliver Neukum <oliver@xxxxxxxxxx> wrote:
>> Am Montag 09 Juni 2008 22:52:21 schrieb Justin Mattock:
>>> On Mon, Jun 9, 2008 at 8:31 PM, Oliver Neukum <oliver@xxxxxxxxxx> wrote:
>>> > Am Montag 09 Juni 2008 22:29:05 schrieb Justin Mattock:
>>> >> On Mon, Jun 9, 2008 at 7:53 PM, Oliver Neukum <oliver@xxxxxxxxxx> wrote:
>>> >> > Am Montag 09 Juni 2008 18:18:19 schrieb Justin Mattock:
>>> >
>>> >> >> Cool; just an update, I've suspended the system numerous times it
>>> >> >> seems appletouch is behaving correctly, in fact
>>> >> >> I think better, why: when I start the system I have two finger scroll
>>> >> >> functionality, then when suspending the system
>>> >> >> after waking up the two finger scroll is still functional.
>>> >> >> regards;
>>> >> >>
>>> >> >
>>> >> > With last week's patch or today's patch?
>>> >> >
>>> >> >        Regards
>>> >> >                Oliver
>>> >> >
>>> >> >
>>> >>
>>> >> Last weeks patch.
>>> >> regards;
>>> >>
>>> >
>>> > Could you also try today's patch?
>>> >
>>> >        Regards
>>> >                Oliver
>>> >
>>> >
>>>
>>> Sure, where is it located.
>>> regards;
>>>
>>
>> Didn't I mail it to you? Anyway, here it is.
>>
>>        Regards
>>                Oliver
>>
>> ----
>>
>> --- linux-2.6.26-rc5/drivers/usb/core/quirks.c  2008-06-05 13:45:57.000000000 +0200
>> +++ linux-2.6.26-rc5-btusb/drivers/usb/core/quirks.c    2008-06-06 08:12:10.000000000 +0200
>> @@ -47,6 +47,9 @@ static const struct usb_device_id usb_qu
>>        /* Edirol SD-20 */
>>        { USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME },
>>
>> +       /* appletouch */
>> +       { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME },
>> +
>>        /* Avision AV600U */
>>        { USB_DEVICE(0x0638, 0x0a13), .driver_info =
>>          USB_QUIRK_STRING_FETCH_255 },
>> --- linux-2.6.26-rc5-btusb/drivers/input/mouse/appletouch.c.alt 2008-06-09 10:40:00.000000000 +0200
>> +++ linux-2.6.26-rc5-btusb/drivers/input/mouse/appletouch.c     2008-06-09 10:40:03.000000000 +0200
>> @@ -589,6 +589,20 @@ static void atp_close(struct input_dev *
>>        dev->open = 0;
>>  }
>>
>> +static int handle_geyser(struct atp *dev)
>> +{
>> +       struct usb_device *udev = dev->udev;
>> +
>> +       if (!atp_is_fountain(dev)) {
>> +               /* switch to raw sensor mode */
>> +               if (atp_geyser_init(udev))
>> +                       return -EIO;
>> +
>> +               printk(KERN_INFO "appletouch: Geyser mode initialized.\n");
>> +       }
>> +       return 0;
>> +}
>> +
>>  static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id)
>>  {
>>        struct atp *dev;
>> @@ -744,6 +758,20 @@ static void atp_disconnect(struct usb_in
>>        printk(KERN_INFO "input: appletouch disconnected\n");
>>  }
>>
>> +static int recover_dev(struct atp *dev)
>> +{
>> +       int rv;
>> +
>> +       rv = handle_geyser(dev);
>> +       if (rv < 0)
>> +               return rv;
>> +
>> +       if (dev->open && usb_submit_urb(dev->urb, GFP_NOIO))
>> +               return -EIO;
>> +
>> +       return 0;
>> +}
>> +
>>  static int atp_suspend(struct usb_interface *iface, pm_message_t message)
>>  {
>>        struct atp *dev = usb_get_intfdata(iface);
>> @@ -764,12 +792,20 @@ static int atp_resume(struct usb_interfa
>>        return 0;
>>  }
>>
>> +static int atp_reset_resume(struct usb_interface *iface)
>> +{
>> +       struct atp *dev = usb_get_intfdata(iface);
>> +
>> +       return recover_dev(dev);
>> +}
>> +
>>  static struct usb_driver atp_driver = {
>>        .name           = "appletouch",
>>        .probe          = atp_probe,
>>        .disconnect     = atp_disconnect,
>>        .suspend        = atp_suspend,
>>        .resume         = atp_resume,
>> +       .reset_resume   = atp_reset_resume,
>>        .id_table       = atp_table,
>>  };
>>
>>
>>
>
> You probably did,  I'll apply this and let you know.
> regards;
>
> --
> Justin P. Mattock
>

O.K. This is smaller than last weeks? anyways I applied the patch, and
am not seeing appletouch freak out like it did, also
two finger scroll is still active upon wakeup(FWIW).  Cool, and thanks
for the help.
regards;

-- 
Justin P. Mattock
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/