diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-07 21:52:04 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-07 21:52:04 +0300 |
commit | 6b75d88fa81b122cce37ebf17428a849ccd3d0f1 (patch) | |
tree | 557cfa400834078dc81a2af6223d46dc182d20e0 | |
parent | e582e08ec059cc9a93d5d154a6429fc4779cf275 (diff) | |
parent | c80be257a4cd0f72c083e6056ff0ce2da871e9dc (diff) | |
download | linux-6b75d88fa81b122cce37ebf17428a849ccd3d0f1.tar.xz |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fix from Wolfram Sang:
"Hot-fix for I2C"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: xgene-slimpro: Fix wrong pointer passed to PTR_ERR()
-rw-r--r-- | drivers/i2c/busses/i2c-xgene-slimpro.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-xgene-slimpro.c b/drivers/i2c/busses/i2c-xgene-slimpro.c index 1a19ebad60ad..63259b3ea5ab 100644 --- a/drivers/i2c/busses/i2c-xgene-slimpro.c +++ b/drivers/i2c/busses/i2c-xgene-slimpro.c @@ -487,7 +487,7 @@ static int xgene_slimpro_i2c_probe(struct platform_device *pdev) pcc_chan = pcc_mbox_request_channel(cl, ctx->mbox_idx); if (IS_ERR(pcc_chan)) { dev_err(&pdev->dev, "PCC mailbox channel request failed\n"); - return PTR_ERR(ctx->pcc_chan); + return PTR_ERR(pcc_chan); } ctx->pcc_chan = pcc_chan; |