lkml.org 
[lkml]   [2011]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/1] Fix error path in wacom_probe
Date
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>
---
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


\
 
 \ /
  Last update: 2011-02-09 08:21    [W:0.123 / U:1.824 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site