Thread (3 messages) 3 messages, 3 authors, 2011-02-10

[PATCH 1/1] Fix error path in wacom_probe

From: Alexander Strakh <hidden>
Date: 2011-02-09 07:18:52
Also in: lkml
Subsystem: input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers: Dmitry Torokhov, Linus Torvalds

From: Alexander Strakh <redacted>

  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 <redacted>
---
 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help