diff options
author | Wolfram Sang <wsa@kernel.org> | 2023-08-14 16:54:36 +0200 |
---|---|---|
committer | Wolfram Sang <wsa@kernel.org> | 2023-08-14 16:54:36 +0200 |
commit | 60c089b2e2c1c744de032c5b075f9349ae2d95c8 (patch) | |
tree | 70a97322adb124ddf31fb29337d3d3ac59de7c49 /drivers/i2c/busses/i2c-dln2.c | |
parent | 3253f6923a7825e301e05130afede82dde62acc9 (diff) | |
parent | 7a34bab2daeaae6d2f32bdfa20b876a8f210cd7a (diff) | |
download | linux-60c089b2e2c1c744de032c5b075f9349ae2d95c8.tar.gz linux-60c089b2e2c1c744de032c5b075f9349ae2d95c8.tar.bz2 linux-60c089b2e2c1c744de032c5b075f9349ae2d95c8.zip |
Merge remote-tracking branch 'andi/i2c/andi-for-next' into i2c/for-mergewindow
Pull the patches Andi kindly collected while I was on hiatus. Thanks,
Andi!
Diffstat (limited to 'drivers/i2c/busses/i2c-dln2.c')
-rw-r--r-- | drivers/i2c/busses/i2c-dln2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-dln2.c b/drivers/i2c/busses/i2c-dln2.c index 4f02cc2fb567..631109c7a098 100644 --- a/drivers/i2c/busses/i2c-dln2.c +++ b/drivers/i2c/busses/i2c-dln2.c @@ -218,10 +218,8 @@ static int dln2_i2c_probe(struct platform_device *pdev) /* initialize the i2c interface */ ret = dln2_i2c_enable(dln2, true); - if (ret < 0) { - dev_err(dev, "failed to initialize adapter: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "failed to initialize adapter\n"); /* and finally attach to i2c layer */ ret = i2c_add_adapter(&dln2->adapter); |