diff options
author | Samuel Holland <samuel@sholland.org> | 2021-02-08 00:19:22 -0600 |
---|---|---|
committer | Wolfram Sang <wsa@kernel.org> | 2021-02-09 11:41:59 +0100 |
commit | aab0b4fe1b757fb40466e506d296b81b03cc1594 (patch) | |
tree | 1c5dcfe9e711fa27494e680a32e9b460d03505f2 /drivers/i2c | |
parent | a39bd92e92b96d05d676fb5c9493cf1c911d2a0a (diff) | |
download | linux-stable-aab0b4fe1b757fb40466e506d296b81b03cc1594.tar.gz linux-stable-aab0b4fe1b757fb40466e506d296b81b03cc1594.tar.bz2 linux-stable-aab0b4fe1b757fb40466e506d296b81b03cc1594.zip |
i2c: mv64xxx: Fix check for missing clock after adding RPM
In commit e5c02cf54154 ("i2c: mv64xxx: Add runtime PM support"), error
pointers to optional clocks were replaced by NULL to simplify the resume
callback implementation. However, that commit missed that the IS_ERR
check in mv64xxx_of_config should be replaced with a NULL check. As a
result, the check always passes, even for an invalid device tree.
Fixes: e5c02cf54154 ("i2c: mv64xxx: Add runtime PM support")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index b03c344323d1..c590d36b5fd1 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -813,7 +813,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, * need to know tclk in order to calculate bus clock * factors. */ - if (IS_ERR(drv_data->clk)) { + if (!drv_data->clk) { rc = -ENODEV; goto out; } |