mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 05:39:54 -04:00
Merge "i2c: i2c-msm-geni: Return correct error code if registration fail"
This commit is contained in:
commit
a9e90cb0c8
1 changed files with 7 additions and 3 deletions
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <linux/clk.h>
|
||||
|
|
@ -955,9 +955,13 @@ static int geni_i2c_probe(struct platform_device *pdev)
|
|||
pm_runtime_set_autosuspend_delay(gi2c->dev, I2C_AUTO_SUSPEND_DELAY);
|
||||
pm_runtime_use_autosuspend(gi2c->dev);
|
||||
pm_runtime_enable(gi2c->dev);
|
||||
i2c_add_adapter(&gi2c->adap);
|
||||
ret = i2c_add_adapter(&gi2c->adap);
|
||||
if (ret) {
|
||||
dev_err(gi2c->dev, "Add adapter failed, ret=%d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
dev_dbg(gi2c->dev, "I2C probed\n");
|
||||
dev_info(gi2c->dev, "I2C probed\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue