X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fdrivers%2Fhid%2Fhid-magicmouse.c;fp=kernel%2Fdrivers%2Fhid%2Fhid-magicmouse.c;h=d6fa496d0ca25c17035233315ba9f5d5ebddc4fd;hb=e09b41010ba33a20a87472ee821fa407a5b8da36;hp=29a74c1efcb85fa727536c4b72be844f9963cd70;hpb=f93b97fd65072de626c074dbe099a1fff05ce060;p=kvmfornfv.git

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;
 }