]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Input: ads7846 - release resources on failure for clean exit
authorPramod Gurav <pramod.gurav@smartplayin.com>
Thu, 31 Jul 2014 05:48:24 +0000 (22:48 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 31 Jul 2014 05:52:09 +0000 (22:52 -0700)
Input device must be released(input_free_device) when ads7846_probe_dt
fails. This fixes the same by releasing resources on failure.

Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/ads7846.c

index da201b8e37dc90aac807a7158278e82a81c59772..e57ba52bf484c111319cd5ecfcbeb06e6528b216 100644 (file)
@@ -1302,8 +1302,10 @@ static int ads7846_probe(struct spi_device *spi)
        pdata = dev_get_platdata(&spi->dev);
        if (!pdata) {
                pdata = ads7846_probe_dt(&spi->dev);
-               if (IS_ERR(pdata))
-                       return PTR_ERR(pdata);
+               if (IS_ERR(pdata)) {
+                       err = PTR_ERR(pdata);
+                       goto err_free_mem;
+               }
        }
 
        ts->model = pdata->model ? : 7846;