From patchwork Sun Feb 14 14:22:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Tomlinson X-Patchwork-Id: 79294 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 o1EENAka024676 for ; Sun, 14 Feb 2010 14:23:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751583Ab0BNOWv (ORCPT ); Sun, 14 Feb 2010 09:22:51 -0500 Received: from mail001.aei.ca ([206.123.6.130]:51211 "EHLO mail001.aei.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751513Ab0BNOWu (ORCPT ); Sun, 14 Feb 2010 09:22:50 -0500 Received: (qmail 11630 invoked by uid 89); 14 Feb 2010 14:22:48 -0000 Received: by simscan 1.2.0 ppid: 11611, pid: 11615, t: 0.0420s scanners: regex: 1.2.0 attach: 1.2.0 Received: from mail002.aei.ca (HELO mail002.contact.net) (206.123.6.132) by mail001.aei.ca with (DHE-RSA-AES256-SHA encrypted) SMTP; 14 Feb 2010 14:22:48 -0000 Received: (qmail 27890 invoked by uid 89); 14 Feb 2010 14:22:48 -0000 Received: by simscan 1.2.0 ppid: 27870, pid: 27876, t: 0.8991s scanners: regex: 1.2.0 attach: 1.2.0 clamav: 0.95.3/m:51 spam: 3.3.0 X-Spam-Checker-Version: SpamAssassin 3.3.0 (2010-01-18) X-Spam-Level: X-Spam-Status: No, hits=-3.0 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.0 Received: from dsl-62-152.aei.ca (HELO grover.localnet) (edt@aei.ca@216.221.62.152) by mail.aei.ca with ESMTPA; 14 Feb 2010 14:22:47 -0000 From: Ed Tomlinson To: Dmitry Torokhov Subject: Re: [PATCH 0/2] Provide a driver for the Apple Magic Mouse - opps Date: Sun, 14 Feb 2010 09:22:41 -0500 User-Agent: KMail/1.13.0 (Linux/2.6.32.8-crc; KDE/4.4.0; x86_64; ; ) Cc: Jiri Kosina , Michael Poole , linux-input@vger.kernel.org, Marcel Holtmann , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org References: <201002131429.29671.edt@aei.ca> <20100214080344.GA4423@core.coreip.homeip.net> In-Reply-To: <20100214080344.GA4423@core.coreip.homeip.net> MIME-Version: 1.0 Message-Id: <201002140922.42014.edt@aei.ca> 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]); Sun, 14 Feb 2010 14:23:10 +0000 (UTC) diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index f94b3e4..71a8669 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -429,8 +429,11 @@ static int magicmouse_probe(struct hid_device *hdev, static void magicmouse_remove(struct hid_device *hdev) { + struct magicmouse_sc *msc; + msc = hid_get_drvdata(hdev); + input_unregister_device(msc->input); hid_hw_stop(hdev); - kfree(hid_get_drvdata(hdev)); + kfree(msc); } static const struct hid_device_id magic_mice[] = {