Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / input / touchscreen / tps6507x-ts.c

diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index a644d18c04dce09862663004217864698948fef0..c8c136cf7bbc2e5429a102974616a0b6dad369c7 100644 (file)
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -335,6 +335,7 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
                dev_err(tsc->dev, "schedule failed");
                goto err2;
         }
+       platform_set_drvdata(pdev, tps6507x_dev);
 
        return 0;
 
@@ -358,7 +359,7 @@ static int __devexit tps6507x_ts_remove(struct platform_device *pdev)
        cancel_delayed_work_sync(&tsc->work);
        destroy_workqueue(tsc->wq);
 
-       input_free_device(input_dev);
+       input_unregister_device(input_dev);
 
        tps6507x_dev->ts = NULL;
        kfree(tsc);