K97 项目相关修改

[firefly-linux-kernel-4.4.55.git] / drivers / input / touchscreen / stmpe-ts.c

diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c
index 656148ec00277d32ee2c7b2d24e6dba673375efb..ae88e13c99ff5194f88bb48f0096daf820c9bf47 100644 (file)
--- a/drivers/input/touchscreen/stmpe-ts.c
+++ b/drivers/input/touchscreen/stmpe-ts.c
@@ -268,7 +268,7 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev)
        struct stmpe_touch *ts;
        struct input_dev *idev;
        struct stmpe_ts_platform_data *ts_pdata = NULL;
-       int ret = 0;
+       int ret;
        int ts_irq;
 
        ts_irq = platform_get_irq_byname(pdev, "FIFO_TH");
@@ -276,12 +276,16 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev)
                return ts_irq;
 
        ts = kzalloc(sizeof(*ts), GFP_KERNEL);
-       if (!ts)
+       if (!ts) {
+               ret = -ENOMEM;
                goto err_out;
+       }
 
        idev = input_allocate_device();
-       if (!idev)
+       if (!idev) {
+               ret = -ENOMEM;
                goto err_free_ts;
+       }
 
        platform_set_drvdata(pdev, ts);
        ts->stmpe = stmpe;
@@ -361,7 +365,6 @@ static int __devexit stmpe_ts_remove(struct platform_device *pdev)
        platform_set_drvdata(pdev, NULL);
 
        input_unregister_device(ts->idev);
-       input_free_device(ts->idev);
 
        kfree(ts);