For stable/linux-2.6.30.y
---------- Forwarded message ----------
Date: Thu, 27 Aug 2009 03:59:28 GMT
From: Linux Kernel Mailing List <linux-ker...@vger.kernel.org>
To: git-commits-h...@vger.kernel.org
Subject: powerpc/ps3: Add missing check for PS3 to rtc-ps3 platform device
registration
Gitweb: http://git.kernel.org/linus/7b6a09f3d6aedeaac923824af2a5df30300b56e9
Commit: 7b6a09f3d6aedeaac923824af2a5df30300b56e9
Parent: f415c413f458837bd0c27086b79aca889f9435e4
Author: Geert Uytterhoeven <geert.uytterhoe...@sonycom.com>
AuthorDate: Sun Aug 23 22:54:32 2009 +0000
Committer: Benjamin Herrenschmidt <b...@kernel.crashing.org>
CommitDate: Thu Aug 27 13:25:46 2009 +1000
powerpc/ps3: Add missing check for PS3 to rtc-ps3 platform device
registration
On non-PS3, we get:
| kernel BUG at drivers/rtc/rtc-ps3.c:36!
because the rtc-ps3 platform device is registered unconditionally in a
kernel
with builtin support for PS3.
Reported-by: Sachin Sant <sach...@in.ibm.com>
Signed-off-by: Geert Uytterhoeven <geert.uytterhoe...@sonycom.com>
Acked-by: Geoff Levand <geoffrey.lev...@am.sony.com>
Signed-off-by: Benjamin Herrenschmidt <b...@kernel.crashing.org>
---
arch/powerpc/platforms/ps3/time.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/platforms/ps3/time.c
b/arch/powerpc/platforms/ps3/time.c
index b178a1e..40b5cb4 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -21,6 +21,7 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
+#include <asm/firmware.h>
#include <asm/rtc.h>
#include <asm/lv1call.h>
#include <asm/ps3.h>
@@ -84,6 +85,9 @@ static int __init ps3_rtc_init(void)
{
struct platform_device *pdev;
+ if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
+ return -ENODEV;
+
pdev = platform_device_register_simple("rtc-ps3", -1, NULL, 0);
if (IS_ERR(pdev))
return PTR_ERR(pdev);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
