summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/hid/hid-magicmouse.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/hid/hid-magicmouse.c')
-rw-r--r--kernel/drivers/hid/hid-magicmouse.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/drivers/hid/hid-magicmouse.c b/kernel/drivers/hid/hid-magicmouse.c
index 29a74c1ef..d6fa496d0 100644
--- a/kernel/drivers/hid/hid-magicmouse.c
+++ b/kernel/drivers/hid/hid-magicmouse.c
@@ -471,18 +471,22 @@ 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)
{
struct magicmouse_sc *msc = hid_get_drvdata(hdev);
+ int ret;
- int ret = magicmouse_setup_input(msc->input, hdev);
+ ret = magicmouse_setup_input(msc->input, hdev);
if (ret) {
hid_err(hdev, "magicmouse setup input failed (%d)\n", ret);
/* clean msc->input to notify probe() of the failure */
msc->input = NULL;
+ return ret;
}
+
+ return 0;
}