Re: [PATCH] Convert touchscreen to input_allocate_device

[Tony Lindgren <tony@atomide.com>]

* Komal Shah <komal_shah802003@yahoo.com> [060118 08:47]:
> --- Juha Yrjölä <juha.yrjola@nokia.com> wrote:
> 
> > 
> > Not quite yet. =) If you allocate the input device earlier, you also
> > have to
> > take care in deallocating it in the error paths after it.
> 
> Ok. Please check the attached patch. Build for OSK. 
> 
> Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
> 
> 
> ---Komal Shah
> http://komalshah.blogspot.com/
> 
> __________________________________________________
> Do You Yahoo!?
> Tired of spam?  Yahoo! Mail has the best spam protection around 
> http://mail.yahoo.com 
Content-Description: 1479429603-tsfix.patch
> diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
> diff --git a/drivers/input/touchscreen/omap/omap_ts.c b/drivers/input/touchscreen/omap/omap_ts.c
> index 5916245..f55ea05 100644
> --- a/drivers/input/touchscreen/omap/omap_ts.c
> +++ b/drivers/input/touchscreen/omap/omap_ts.c
> @@ -133,6 +133,12 @@ static int __init omap_ts_probe(struct p
>  	int status = -ENODEV;
>  
>  	memset(&ts_omap, 0, sizeof(ts_omap));
> +	
> +	ts_omap.inputdevice = input_allocate_device();
> +	if (!ts_omap.inputdevice) {
> +		return -ENOMEM;
> +	}
> +
>  	spin_lock_init(&ts_omap.lock);
>  
>  	for (i = 0; i < ARRAY_SIZE(ts_devs); i++) {
> @@ -145,8 +151,10 @@ static int __init omap_ts_probe(struct p
>  		}
>  	}
>  
> -	if (status != 0)
> +	if (status != 0) {
> +	    	input_free_device(ts_omap.inputdevice);
>  		return status;
> +	}
>  
>  	// Init acquisition timer function
>  	init_timer(&ts_omap.ts_timer);
> @@ -159,15 +167,18 @@ static int __init omap_ts_probe(struct p
>  			printk(KERN_ERR
>  	  "omap_ts.c: Could not allocate touchscreen IRQ!\n");
>  			ts_omap.irq = -1;
> +			ts_omap.dev->remove();
> +			input_free_device(ts_omap.inputdevice);
>  			return -EINVAL;
>  		}
>  		ts_omap.irq_enabled = 1;
>  	} else {
>  		printk(KERN_ERR "omap_ts.c: No touchscreen IRQ assigned!\n");
> +		ts_omap.dev->remove();
> +		input_free_device(ts_omap.inputdevice);
>  		return -EINVAL;
>  	}
>  
> -	ts_omap.inputdevice = input_allocate_device();
>  	ts_omap.inputdevice->name = OMAP_TS_NAME;
>  	ts_omap.inputdevice->dev = &pdev->dev;
>  	ts_omap.inputdevice->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);

Pushing today.

Tony