diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-16 10:13:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-16 10:13:38 -0500 |
| commit | 23b4cf32b7ed9e2cd35638878d7c9ccd7537c7ba (patch) | |
| tree | 0acc173497ca3abca14f6b8a3e87aaa000ef5fab /drivers/i2c/mxc_i2c.c | |
| parent | da54e7e5a912565ab5979093044d65535f359f40 (diff) | |
| parent | fb0128736b7bfb83b43a35211f603c74f8627eff (diff) | |
Merge git://git.denx.de/u-boot-i2c
Diffstat (limited to 'drivers/i2c/mxc_i2c.c')
| -rw-r--r-- | drivers/i2c/mxc_i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 205274e947..79228c2757 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -784,9 +784,9 @@ static int mxc_i2c_probe(struct udevice *bus) ret2 = gpio_request_by_name_nodev(offset_to_ofnode(node), "sda-gpios", 0, &i2c_bus->sda_gpio, GPIOD_IS_OUT); - if (!dm_gpio_is_valid(&i2c_bus->sda_gpio) | - !dm_gpio_is_valid(&i2c_bus->scl_gpio) | - ret | ret2) { + if (!dm_gpio_is_valid(&i2c_bus->sda_gpio) || + !dm_gpio_is_valid(&i2c_bus->scl_gpio) || + ret || ret2) { dev_err(dev, "i2c bus %d at %lu, fail to request scl/sda gpio\n", bus->seq, i2c_bus->base); return -EINVAL; } |