Merge branch 'ep93xx-cleanup' into ep93xx-for-next

[karo-tx-linux.git] / drivers / input / touchscreen / tnetv107x-ts.c

diff --git a/drivers/input/touchscreen/tnetv107x-ts.c b/drivers/input/touchscreen/tnetv107x-ts.c
index acfb87607b878f03098857dabed8452b98e83b3d..c47827a26e3ce1e612023aa3afcd473658fb22bc 100644 (file)
--- a/drivers/input/touchscreen/tnetv107x-ts.c
+++ b/drivers/input/touchscreen/tnetv107x-ts.c
@@ -351,7 +351,6 @@ error_clk:
 error_map:
        release_mem_region(ts->res->start, resource_size(ts->res));
 error_res:
-       platform_set_drvdata(pdev, NULL);
        kfree(ts);
 
        return error;
@@ -366,7 +365,6 @@ static int tsc_remove(struct platform_device *pdev)
        clk_put(ts->clk);
        iounmap(ts->regs);
        release_mem_region(ts->res->start, resource_size(ts->res));
-       platform_set_drvdata(pdev, NULL);
        kfree(ts);
 
        return 0;