|
@@ -636,7 +636,7 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
|
|
int r;
|
|
int r;
|
|
|
|
|
|
r = pm_runtime_get_sync(dev->dev);
|
|
r = pm_runtime_get_sync(dev->dev);
|
|
- if (IS_ERR_VALUE(r))
|
|
|
|
|
|
+ if (r < 0)
|
|
goto out;
|
|
goto out;
|
|
|
|
|
|
r = omap_i2c_wait_for_bb(dev);
|
|
r = omap_i2c_wait_for_bb(dev);
|
|
@@ -1155,7 +1155,7 @@ omap_i2c_probe(struct platform_device *pdev)
|
|
pm_runtime_use_autosuspend(dev->dev);
|
|
pm_runtime_use_autosuspend(dev->dev);
|
|
|
|
|
|
r = pm_runtime_get_sync(dev->dev);
|
|
r = pm_runtime_get_sync(dev->dev);
|
|
- if (IS_ERR_VALUE(r))
|
|
|
|
|
|
+ if (r < 0)
|
|
goto err_free_mem;
|
|
goto err_free_mem;
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -1276,7 +1276,7 @@ static int omap_i2c_remove(struct platform_device *pdev)
|
|
|
|
|
|
i2c_del_adapter(&dev->adapter);
|
|
i2c_del_adapter(&dev->adapter);
|
|
ret = pm_runtime_get_sync(&pdev->dev);
|
|
ret = pm_runtime_get_sync(&pdev->dev);
|
|
- if (IS_ERR_VALUE(ret))
|
|
|
|
|
|
+ if (ret < 0)
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
|
|
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
|