From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Feb 2015 20:56:40 +0000 (-0800)
Subject: Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bfe9183fdcc0575a648d1401facc649888a1f49a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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()
---

bfe9183fdcc0575a648d1401facc649888a1f49a
diff --cc drivers/mailbox/pcc.c
index e8902f8dddfc,70576fb707a5..977c814cdf6f
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@@ -393,9 -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_err("Err creating PCC platform bundle\n");
 +		pr_debug("Err creating PCC platform bundle\n");
- 		return -ENODEV;
+ 		return PTR_ERR(pcc_pdev);
  	}
  
  	return 0;