Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28918c21 authored by Michael Poole's avatar Michael Poole Committed by Jiri Kosina
Browse files

HID: magicmouse: fix oops after device removal 



Ask the HID core not to register an input device for the mouse.
Fix an oops after removing the device, due to leaving the new
input device registered.

Signed-off-by: default avatarMichael Poole <mdpoole@troilus.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a85821fc

drivers/hid/hid-magicmouse.c

+5 −2
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static int magicmouse_probe(struct hid_device *hdev, 
		goto err_free;

	}



	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_HIDINPUT);

	if (ret) {

		dev_err(&hdev->dev, "magicmouse hw start failed\n");

		goto err_free;
@@ -409,8 +409,11 @@ static int magicmouse_probe(struct hid_device *hdev, 


static void magicmouse_remove(struct hid_device *hdev)

{

	struct magicmouse_sc *msc = hid_get_drvdata(hdev);



	hid_hw_stop(hdev);

	kfree(hid_get_drvdata(hdev));

	input_unregister_device(msc->input);

	kfree(msc);

}



static const struct hid_device_id magic_mice[] = {