Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

torvalds · torvalds · commit 6b75d88fa81b · 2021-11-07T10:52:04.000-08:00
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()
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ static int xgene_slimpro_i2c_probe(struct platform_device *pdev)`
`487`	`487`	`pcc_chan = pcc_mbox_request_channel(cl, ctx->mbox_idx);`
`488`	`488`	`if (IS_ERR(pcc_chan)) {`
`489`	`489`	`dev_err(&pdev->dev, "PCC mailbox channel request failed\n");`
`490`		`- return PTR_ERR(ctx->pcc_chan);`
	`490`	`+ return PTR_ERR(pcc_chan);`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`ctx->pcc_chan = pcc_chan;`