| Message ID | 20210208061922.10073-1-samuel@sholland.org |
|---|---|
| State | Accepted |
| Commit | aab0b4fe1b757fb40466e506d296b81b03cc1594 |
| Headers | show |
| Series | i2c: mv64xxx: Fix check for missing clock | expand |
On Mon, Feb 08, 2021 at 12:19:22AM -0600, Samuel Holland wrote: > 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> Added "RPM" to $subject and applied to for-next, thanks!
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; }
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> --- drivers/i2c/busses/i2c-mv64xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)