Merge tag 'v3.10.56' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / hid / hid-magicmouse.c

diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index c24f3dfd9367e94034c36065a3c6520c7d111193..6fa58c0c6f20b2b4e4b0610f03000368a78eb184 100644 (file)
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -471,7 +471,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)
 
 {
@@ -483,6 +483,7 @@ static void magicmouse_input_configured(struct hid_device *hdev,
                /* clean msc->input to notify probe() of the failure */
                msc->input = NULL;
        }
+    return ret;
 }