diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-11 12:56:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-11 12:56:40 -0800 |
| commit | bfe9183fdcc0575a648d1401facc649888a1f49a (patch) | |
| tree | 8d5a9decfb3342f89dbed46d555d8e1c4e30dde1 /drivers/mailbox/pcc.c | |
| parent | Merge tag 'pinctrl-v3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl (diff) | |
| parent | mailbox: Add Altera mailbox driver (diff) | |
| download | linux-dev-bfe9183fdcc0575a648d1401facc649888a1f49a.tar.xz linux-dev-bfe9183fdcc0575a648d1401facc649888a1f49a.zip | |
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox framework updates from Jassi Brar.
* 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: Add Altera mailbox driver
mailbox: check for bit set before polling
Mailbox: Fix return value check in pcc_init()
Diffstat (limited to 'drivers/mailbox/pcc.c')
| -rw-r--r-- | drivers/mailbox/pcc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index e8902f8dddfc..977c814cdf6f 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -393,9 +393,9 @@ static int __init pcc_init(void) pcc_pdev = platform_create_bundle(&pcc_mbox_driver, pcc_mbox_probe, NULL, 0, NULL, 0); - if (!pcc_pdev) { + if (IS_ERR(pcc_pdev)) { pr_debug("Err creating PCC platform bundle\n"); - return -ENODEV; + return PTR_ERR(pcc_pdev); } return 0; |