From: Michael Poole <mdpoole@troilus.org>
To: linux-input@vger.kernel.org, Jiri Kosina <jkosina@suse.cz>
Cc: Benjamin Tissoires <tissoire@tls.cena.fr>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Stephane Chatty <chatty@enac.fr>
Subject: [PATCH 1/1] hid-magicmouse: Fix oops after device removal.
Date: Mon, 08 Mar 2010 19:38:38 -0500 [thread overview]
Message-ID: <87aaui2usx.fsf@troilus.org> (raw)
>From 57c6af4c2dadcce71566995baa15593103ab33aa Mon Sep 17 00:00:00 2001
From: Michael Poole <mdpoole@troilus.org>
Date: Mon, 8 Mar 2010 19:09:26 -0500
Subject: [PATCH 1/1] 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: Michael Poole <mdpoole@troilus.org>
---
drivers/hid/hid-magicmouse.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index 4a3a94f..2e7d701 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -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,7 +409,10 @@ err_free:
static void magicmouse_remove(struct hid_device *hdev)
{
+ struct magicmouse_sc *msc;
+ msc = hid_get_drvdata(hdev);
hid_hw_stop(hdev);
+ input_unregister_device(msc->input);
kfree(hid_get_drvdata(hdev));
}
--
1.7.0.2
next reply other threads:[~2010-03-09 0:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-09 0:38 Michael Poole [this message]
2010-03-09 7:48 ` [PATCH 1/1] hid-magicmouse: Fix oops after device removal Dmitry Torokhov
2010-03-09 11:32 ` Michael Poole
2010-03-09 11:47 ` [PATCH v2] " Michael Poole
2010-03-09 12:37 ` Jiri Kosina
2010-03-09 17:36 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87aaui2usx.fsf@troilus.org \
--to=mdpoole@troilus.org \
--cc=chatty@enac.fr \
--cc=dmitry.torokhov@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=tissoire@tls.cena.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.