diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:08:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:08:29 +0100 |
| commit | c494cd6469ab0f4bdd663d1a2d396b0ec2f42103 (patch) | |
| tree | 5830ff0a0266c5500188d1ee9df8f2cbe0871b35 /drivers/i2c/i2c-core-of.c | |
| parent | 8cacac6ecd6d289d4ab52590784636a5b1043c66 (diff) | |
| parent | c4b75479741c9c3a4f0abff5baa5013d27640ac1 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/i2c/i2c-core-of.c')
| -rw-r--r-- | drivers/i2c/i2c-core-of.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c index 6f632d543fcc..7eb41990bd6d 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -245,14 +245,14 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action, } client = of_i2c_register_device(adap, rd->dn); - put_device(&adap->dev); - if (IS_ERR(client)) { dev_err(&adap->dev, "failed to create client for '%pOF'\n", rd->dn); + put_device(&adap->dev); of_node_clear_flag(rd->dn, OF_POPULATED); return notifier_from_errno(PTR_ERR(client)); } + put_device(&adap->dev); break; case OF_RECONFIG_CHANGE_REMOVE: /* already depopulated? */ |