git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
s390
/
hypfs
/
hypfs_diag.c
diff --git
a/arch/s390/hypfs/hypfs_diag.c
b/arch/s390/hypfs/hypfs_diag.c
index
020e51c
..
cd4a81b
100644
(file)
--- a/
arch/s390/hypfs/hypfs_diag.c
+++ b/
arch/s390/hypfs/hypfs_diag.c
@@
-638,18
+638,21
@@
__init int hypfs_diag_init(void)
pr_err("The hardware system does not support hypfs\n");
return -ENODATA;
}
pr_err("The hardware system does not support hypfs\n");
return -ENODATA;
}
- rc = diag224_get_name_table();
- if (rc) {
- diag204_free_buffer();
- pr_err("The hardware system does not provide all "
- "functions required by hypfs\n");
- }
if (diag204_info_type == INFO_EXT) {
rc = hypfs_dbfs_init();
if (rc)
if (diag204_info_type == INFO_EXT) {
rc = hypfs_dbfs_init();
if (rc)
-
diag204_free_buffer()
;
+
return rc
;
}
}
- return rc;
+ if (MACHINE_IS_LPAR) {
+ rc = diag224_get_name_table();
+ if (rc) {
+ pr_err("The hardware system does not provide all "
+ "functions required by hypfs\n");
+ debugfs_remove(dbfs_d204_file);
+ return rc;
+ }
+ }
+ return 0;
}
void hypfs_diag_exit(void)
}
void hypfs_diag_exit(void)