[PATCH 1/1] Fix error path in wacom_probe

[PATCH 1/1] Fix error path in wacom_probe

[Alexander Strakh]

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

Re: [PATCH 1/1] Fix error path in wacom_probe

[Dmitry Torokhov]

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

Re: [PATCH 1/1] Fix error path in wacom_probe

[Henrik Rydberg]

Hi Alexander,

>   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.

Yep, thanks for this.

Acked-by: Henrik Rydberg <rydberg@euromail.se>