Commit 050b3e58 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] sn: hcl.c clean up for init failures and OOM

From: Pat Gefre <pfg@sgi.com>

hcl.c clean up for init failures and OOM
parent 279203ab
...@@ -82,8 +82,10 @@ int __init init_hcl(void) ...@@ -82,8 +82,10 @@ int __init init_hcl(void)
* Create the hwgraph_root. * Create the hwgraph_root.
*/ */
rv = hwgraph_path_add(NULL, EDGE_LBL_HW, &hwgraph_root); rv = hwgraph_path_add(NULL, EDGE_LBL_HW, &hwgraph_root);
if (rv) if (rv) {
printk ("WARNING: init_hcl: Failed to create hwgraph_root. Error = %d.\n", rv); printk("init_hcl: Failed to create hwgraph_root.\n");
return -1;
}
/* /*
* Initialize the HCL string table. * Initialize the HCL string table.
...@@ -96,8 +98,8 @@ int __init init_hcl(void) ...@@ -96,8 +98,8 @@ int __init init_hcl(void)
*/ */
rv = hwgraph_path_add(hwgraph_root, EDGE_LBL_LINUX_BUS, &linux_busnum); rv = hwgraph_path_add(hwgraph_root, EDGE_LBL_LINUX_BUS, &linux_busnum);
if (linux_busnum == NULL) { if (linux_busnum == NULL) {
panic("HCL: Unable to create %s\n", EDGE_LBL_LINUX_BUS); printk("HCL: Unable to create %s\n", EDGE_LBL_LINUX_BUS);
return(0); return -1;
} }
pci_bus_cvlink_init(); pci_bus_cvlink_init();
...@@ -108,8 +110,7 @@ int __init init_hcl(void) ...@@ -108,8 +110,7 @@ int __init init_hcl(void)
*/ */
init_ioconfig_bus(); init_ioconfig_bus();
return(0); return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment