linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Michael Poole <mdpoole@troilus.org>
Cc: linux-input@vger.kernel.org, Jiri Kosina <jkosina@suse.cz>,
	Benjamin Tissoires <tissoire@tls.cena.fr>,
	Stephane Chatty <chatty@enac.fr>
Subject: Re: [PATCH 1/1] hid-magicmouse: Fix oops after device removal.
Date: Mon, 8 Mar 2010 23:48:20 -0800	[thread overview]
Message-ID: <20100309074820.GD17288@core.coreip.homeip.net> (raw)
In-Reply-To: <87aaui2usx.fsf@troilus.org>

On Mon, Mar 08, 2010 at 07:38:38PM -0500, Michael Poole wrote:
> 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;

Blank lines between variable definitions and code are always
appreciated. but also coudl be written as:

	struct magicmouse_sc *msc = hid_get_drvdata(dev);

> +	msc = hid_get_drvdata(hdev);
>  	hid_hw_stop(hdev);
> +	input_unregister_device(msc->input);
>  	kfree(hid_get_drvdata(hdev));

You have msc already sho that should be 'kfree(msc);'.
>  }
>  

-- 
Dmitry

  reply	other threads:[~2010-03-09  7:48 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-09  0:38 [PATCH 1/1] hid-magicmouse: Fix oops after device removal Michael Poole
2010-03-09  7:48 ` Dmitry Torokhov [this message]
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=20100309074820.GD17288@core.coreip.homeip.net \
    --to=dmitry.torokhov@gmail.com \
    --cc=chatty@enac.fr \
    --cc=jkosina@suse.cz \
    --cc=linux-input@vger.kernel.org \
    --cc=mdpoole@troilus.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).