lkml.org 
[lkml]   [2010]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 2/7 v3] HID: magicmouse: simplify multitouch feature request
    On Tue, 31 Aug 2010, Chase Douglas wrote:

    > From: Chase Douglas <chase.douglas@ubuntu.com>
    >
    > Only the first feature request is required to put the Magic Mouse into
    > multitouch mode. This is also the case for the Magic Trackpad, for which
    > support will be added in a later commit.
    >
    > Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
    > Acked-by: Michael Poole <mdpoole@troilus.org>

    Applied, thanks.

    > ---
    > drivers/hid/hid-magicmouse.c | 16 ++++------------
    > 1 files changed, 4 insertions(+), 12 deletions(-)
    >
    > diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
    > index d38b529..8a2fe78 100644
    > --- a/drivers/hid/hid-magicmouse.c
    > +++ b/drivers/hid/hid-magicmouse.c
    > @@ -380,8 +380,7 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
    > static int magicmouse_probe(struct hid_device *hdev,
    > const struct hid_device_id *id)
    > {
    > - __u8 feature_1[] = { 0xd7, 0x01 };
    > - __u8 feature_2[] = { 0xf8, 0x01, 0x32 };
    > + __u8 feature[] = { 0xd7, 0x01 };
    > struct input_dev *input;
    > struct magicmouse_sc *msc;
    > struct hid_report *report;
    > @@ -426,17 +425,10 @@ static int magicmouse_probe(struct hid_device *hdev,
    > }
    > report->size = 6;
    >
    > - ret = hdev->hid_output_raw_report(hdev, feature_1, sizeof(feature_1),
    > + ret = hdev->hid_output_raw_report(hdev, feature, sizeof(feature),
    > HID_FEATURE_REPORT);
    > - if (ret != sizeof(feature_1)) {
    > - dev_err(&hdev->dev, "unable to request touch data (1:%d)\n",
    > - ret);
    > - goto err_stop_hw;
    > - }
    > - ret = hdev->hid_output_raw_report(hdev, feature_2,
    > - sizeof(feature_2), HID_FEATURE_REPORT);
    > - if (ret != sizeof(feature_2)) {
    > - dev_err(&hdev->dev, "unable to request touch data (2:%d)\n",
    > + if (ret != sizeof(feature)) {
    > + dev_err(&hdev->dev, "unable to request touch data (%d)\n",
    > ret);
    > goto err_stop_hw;
    > }
    > --
    > 1.7.1
    >

    --
    Jiri Kosina
    SUSE Labs, Novell Inc.


    \
     
     \ /
      Last update: 2010-09-03 16:01    [W:3.440 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site