mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 09:12:07 +00:00
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()
This commit is contained in:
commit
6b75d88fa8
@ -487,7 +487,7 @@ static int xgene_slimpro_i2c_probe(struct platform_device *pdev)
|
|||||||
pcc_chan = pcc_mbox_request_channel(cl, ctx->mbox_idx);
|
pcc_chan = pcc_mbox_request_channel(cl, ctx->mbox_idx);
|
||||||
if (IS_ERR(pcc_chan)) {
|
if (IS_ERR(pcc_chan)) {
|
||||||
dev_err(&pdev->dev, "PCC mailbox channel request failed\n");
|
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;
|
ctx->pcc_chan = pcc_chan;
|
||||||
|
Loading…
Reference in New Issue
Block a user