From patchwork Tue Mar 9 00:38:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Poole X-Patchwork-Id: 84191 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o290cgsN017117 for ; Tue, 9 Mar 2010 00:38:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756203Ab0CIAil (ORCPT ); Mon, 8 Mar 2010 19:38:41 -0500 Received: from na3sys009aog112.obsmtp.com ([74.125.149.207]:56833 "HELO na3sys009aog112.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753884Ab0CIAil (ORCPT ); Mon, 8 Mar 2010 19:38:41 -0500 Received: from source ([209.85.221.175]) by na3sys009aob112.postini.com ([74.125.148.12]) with SMTP ID DSNKS5WYkDZK0hTrM/C4D/IfxoiT9kqukjRz@postini.com; Mon, 08 Mar 2010 16:38:41 PST Received: by mail-qy0-f175.google.com with SMTP id 5so811659qyk.13 for ; Mon, 08 Mar 2010 16:38:40 -0800 (PST) Received: by 10.229.216.130 with SMTP id hi2mr1289591qcb.28.1268095120183; Mon, 08 Mar 2010 16:38:40 -0800 (PST) Received: from graviton.troilus.org (pool-72-83-66-147.washdc.east.verizon.net [72.83.66.147]) by mx.google.com with ESMTPS id 23sm3847861qyk.7.2010.03.08.16.38.38 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 08 Mar 2010 16:38:39 -0800 (PST) From: Michael Poole To: linux-input@vger.kernel.org, Jiri Kosina Cc: Benjamin Tissoires , Dmitry Torokhov , Stephane Chatty Subject: [PATCH 1/1] hid-magicmouse: Fix oops after device removal. Date: Mon, 08 Mar 2010 19:38:38 -0500 Message-ID: <87aaui2usx.fsf@troilus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 09 Mar 2010 00:38:42 +0000 (UTC) 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)); }