From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Alexander Strakh <cromlehg@gmail.com>
Cc: rydberg@euromail.se, oneukum@suse.de,
oblivian@users.sourceforge.net, linux-input@vger.kernel.org,
linux-kernel@vger.kernel.org, Alexander Strakh <strakh@ispras.ru>
Subject: Re: [PATCH 1/1] Fix error path in wacom_probe
Date: Wed, 9 Feb 2011 00:50:07 -0800 [thread overview]
Message-ID: <20110209085007.GC7256@core.coreip.homeip.net> (raw)
In-Reply-To: <1297237048-32714-1-git-send-email-strakh@ispras.ru>
On Wed, Feb 09, 2011 at 10:37:28AM +0300, Alexander Strakh wrote:
> From: Alexander Strakh <cromlehg@gmail.com>
>
> In file drivers/input/tablet/wacom_sys.c in
> wacom_probe after error we can goto label2. In
> this case function usb_free was not called.
> It will be right goto for the label tail3.
>
> wacom->irq = usb_alloc_urb(0, GFP_KERNEL);
>
> ...
>
> /* Retrieve the physical and logical size for OEM devices */
> error = wacom_retrieve_hid_descriptor(intf, features);
> if (error)
> goto fail2;
> ...
> fail3: usb_free_urb(wacom->irq);
> fail2: usb_free_coherent(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
>
> Replaced wrong transition.
>
> Signed-off-by: Alexander Strakh <strakh@ispras.ru>
Will apply, thank you.
> ---
> drivers/input/tablet/wacom_sys.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
> index fc38149..cf8fb9f 100644
> --- a/drivers/input/tablet/wacom_sys.c
> +++ b/drivers/input/tablet/wacom_sys.c
> @@ -519,7 +519,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
> /* Retrieve the physical and logical size for OEM devices */
> error = wacom_retrieve_hid_descriptor(intf, features);
> if (error)
> - goto fail2;
> + goto fail3;
>
> wacom_setup_device_quirks(features);
>
> --
> 1.7.1
>
--
Dmitry
next prev parent reply other threads:[~2011-02-09 8:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-09 7:37 [PATCH 1/1] Fix error path in wacom_probe Alexander Strakh
2011-02-09 8:50 ` Dmitry Torokhov [this message]
2011-02-10 13:18 ` Henrik Rydberg
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=20110209085007.GC7256@core.coreip.homeip.net \
--to=dmitry.torokhov@gmail.com \
--cc=cromlehg@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oblivian@users.sourceforge.net \
--cc=oneukum@suse.de \
--cc=rydberg@euromail.se \
--cc=strakh@ispras.ru \
/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).