diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-26 14:24:50 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-26 14:24:50 +0300 |
| commit | e9e4e44309f866b115d08ab4a54834008c50a8a4 (patch) | |
| tree | ae9f91e682a4d6592ef263f30a4a0b1a862b7987 /drivers/mailbox/pcc.c | |
| parent | 8a26ce4e544659256349551283414df504889a59 (diff) | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | linux-e9e4e44309f866b115d08ab4a54834008c50a8a4.tar.xz | |
Merge tag 'v4.0-rc1' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/mailbox/pcc.c')
| -rw-r--r-- | drivers/mailbox/pcc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index 6dbf6fcbdfaf..977c814cdf6f 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -386,16 +386,16 @@ static int __init pcc_init(void) ret = acpi_pcc_probe(); if (ret) { - pr_err("ACPI PCC probe failed.\n"); + pr_debug("ACPI PCC probe failed.\n"); return -ENODEV; } pcc_pdev = platform_create_bundle(&pcc_mbox_driver, pcc_mbox_probe, NULL, 0, NULL, 0); - if (!pcc_pdev) { - pr_err("Err creating PCC platform bundle\n"); - return -ENODEV; + if (IS_ERR(pcc_pdev)) { + pr_debug("Err creating PCC platform bundle\n"); + return PTR_ERR(pcc_pdev); } return 0; |