aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-omap.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/i2c/busses/i2c-omap.c')
-rw-r--r--drivers/i2c/busses/i2c-omap.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 4cc2f0528c88..79d05128c77e 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1262,7 +1262,6 @@ err_unuse_clocks:
1262 pm_runtime_put(dev->dev); 1262 pm_runtime_put(dev->dev);
1263 pm_runtime_disable(&pdev->dev); 1263 pm_runtime_disable(&pdev->dev);
1264err_free_mem: 1264err_free_mem:
1265 platform_set_drvdata(pdev, NULL);
1266 1265
1267 return r; 1266 return r;
1268} 1267}
@@ -1272,8 +1271,6 @@ static int omap_i2c_remove(struct platform_device *pdev)
1272 struct omap_i2c_dev *dev = platform_get_drvdata(pdev); 1271 struct omap_i2c_dev *dev = platform_get_drvdata(pdev);
1273 int ret; 1272 int ret;
1274 1273
1275 platform_set_drvdata(pdev, NULL);
1276
1277 i2c_del_adapter(&dev->adapter); 1274 i2c_del_adapter(&dev->adapter);
1278 ret = pm_runtime_get_sync(&pdev->dev); 1275 ret = pm_runtime_get_sync(&pdev->dev);
1279 if (IS_ERR_VALUE(ret)) 1276 if (IS_ERR_VALUE(ret))