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

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
index 1a19ebad60adf094a6990305ba0cbf99864003c1..63259b3ea5abd7aa43de6b22d0ec7861a47e7489 100644 (file)
--- 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;