diff options
author | Andrew Donnellan <andrew.donnellan@au1.ibm.com> | 2016-02-18 12:12:54 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-02-22 20:31:55 +1100 |
commit | 88409d0c863b3ba7d9e3090fb46cdce16207a1d8 (patch) | |
tree | 097473ba60e866e7e92b78651fbe32f3869aed52 /arch/powerpc | |
parent | 56c08e6d226c860ad097fa6ba109133228c56722 (diff) | |
download | op-kernel-dev-88409d0c863b3ba7d9e3090fb46cdce16207a1d8.zip op-kernel-dev-88409d0c863b3ba7d9e3090fb46cdce16207a1d8.tar.gz |
powerpc/powernv: don't create OPAL msglog sysfs entry if memcons init fails
When initialising OPAL interfaces, there is a possibility that
opal_msglog_init() may fail to initialise the msglog/memory console.
Fix opal_msglog_sysfs_init() so it doesn't try to create sysfs entry for
the msglog if this occurs.
Suggested-by: Joel Stanley <joel@jms.id.au>
Fixes: 9b4fffa14906 ("powerpc/powernv: new function to access OPAL msglog")
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/platforms/powernv/opal-msglog.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powernv/opal-msglog.c b/arch/powerpc/platforms/powernv/opal-msglog.c index 59fa6e1..39d6ff9 100644 --- a/arch/powerpc/platforms/powernv/opal-msglog.c +++ b/arch/powerpc/platforms/powernv/opal-msglog.c @@ -128,6 +128,11 @@ void __init opal_msglog_init(void) void __init opal_msglog_sysfs_init(void) { + if (!opal_memcons) { + pr_warn("OPAL: message log initialisation failed, not creating sysfs entry\n"); + return; + } + if (sysfs_create_bin_file(opal_kobj, &opal_msglog_attr) != 0) pr_warn("OPAL: sysfs file creation failed\n"); } |