Commit 6b75d88f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents e582e08e c80be257

drivers/i2c/busses/i2c-xgene-slimpro.c

+1 −1
Original line number Diff line number Diff line
@@ -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;