diff options
| author | Pritesh Raithatha <praithatha@nvidia.com> | 2014-04-01 17:12:27 +0530 |
|---|---|---|
| committer | Pritesh Raithatha <praithatha@nvidia.com> | 2014-04-04 06:46:55 -0700 |
| commit | dc78b8127a6f3f1f95ad429bddda107eedf3f33d (patch) | |
| tree | 2bf8753c33fd231d152afb3a422b54f3ec818711 | |
| parent | 801cd57dae6bf97e5bf1085e2a0df7c148ffec61 (diff) | |
hid: magicmouse: fix return type of magicmouse_input_configured
return type of input_configured in hid_driver struct (include/linux/hid.h) is
changed from void to int with change 5925993fe56e1a4ddb26d2085fdd16f6a6153365
and due to that magicmouse is broken.
Bug 1437341
Change-Id: Ia8e1dc181624dd8a3520e3aad00f77918549d3cf
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-on: http://git-master/r/390712
(cherry picked from commit e38628e8e14e919c0ffd8b18b8b77376ff93d3e9)
Reviewed-on: http://git-master/r/391814
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
| -rw-r--r-- | drivers/hid/hid-magicmouse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 5bc37343eb22..bd0af6add0fb 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -3,6 +3,7 @@ * * Copyright (c) 2010 Michael Poole <mdpoole@troilus.org> * Copyright (c) 2010 Chase Douglas <chase.douglas@canonical.com> + * Copyright (c) 2014 NVIDIA Corporation. All rights reserved. */ /* @@ -461,7 +462,7 @@ static int magicmouse_input_mapping(struct hid_device *hdev, return 0; } -static void magicmouse_input_configured(struct hid_device *hdev, +static int magicmouse_input_configured(struct hid_device *hdev, struct hid_input *hi) { @@ -473,6 +474,7 @@ static void magicmouse_input_configured(struct hid_device *hdev, /* clean msc->input to notify probe() of the failure */ msc->input = NULL; } + return ret; } |