|
@@ -585,7 +585,9 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
|
|
|
int i;
|
|
|
int r;
|
|
|
|
|
|
- pm_runtime_get_sync(dev->dev);
|
|
|
+ r = pm_runtime_get_sync(dev->dev);
|
|
|
+ if (IS_ERR_VALUE(r))
|
|
|
+ return r;
|
|
|
|
|
|
r = omap_i2c_wait_for_bb(dev);
|
|
|
if (r < 0)
|
|
@@ -1011,7 +1013,9 @@ omap_i2c_probe(struct platform_device *pdev)
|
|
|
dev->regs = (u8 *)reg_map_ip_v1;
|
|
|
|
|
|
pm_runtime_enable(dev->dev);
|
|
|
- pm_runtime_get_sync(dev->dev);
|
|
|
+ r = pm_runtime_get_sync(dev->dev);
|
|
|
+ if (IS_ERR_VALUE(r))
|
|
|
+ goto err_free_mem;
|
|
|
|
|
|
dev->rev = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG) & 0xff;
|
|
|
|
|
@@ -1103,12 +1107,16 @@ omap_i2c_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
struct omap_i2c_dev *dev = platform_get_drvdata(pdev);
|
|
|
struct resource *mem;
|
|
|
+ int ret;
|
|
|
|
|
|
platform_set_drvdata(pdev, NULL);
|
|
|
|
|
|
free_irq(dev->irq, dev);
|
|
|
i2c_del_adapter(&dev->adapter);
|
|
|
- pm_runtime_get_sync(&pdev->dev);
|
|
|
+ ret = pm_runtime_get_sync(&pdev->dev);
|
|
|
+ if (IS_ERR_VALUE(ret))
|
|
|
+ return ret;
|
|
|
+
|
|
|
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
|
|
|
pm_runtime_put(&pdev->dev);
|
|
|
pm_runtime_disable(&pdev->dev);
|