From 3eaee1d88beb28254a69013bb16ca245bbe032c9 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew@wil.cx>
Date: Wed, 4 Oct 2006 13:37:41 -0600
Subject: [PATCH] --- yaml --- r: 39007 b: refs/heads/master c:
 1070c9655b90016ec4c9b59c402292e57ee15885 h: refs/heads/master i:   39005:
 40eabd351d96d1d63a92b6b641dfe2e39b6eb035   39003:
 5b8c29fe35e1c255a1bd640e0124e1a058b1e20d   38999:
 c239470acb1669b02f20a7eade5961ab7db51fc2   38991:
 e03e508cf05dfcc0e9a7c5f18d3b1f498270b651   38975:
 dc63371a47ae7680a6b4b5591a544c4c113b3fb8 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/parisc/kernel/drivers.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 65b63aee77a3..267eafc37256 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f64ef295032d07345ca26bf4876a1577c4dccb37
+refs/heads/master: 1070c9655b90016ec4c9b59c402292e57ee15885
diff --git a/trunk/arch/parisc/kernel/drivers.c b/trunk/arch/parisc/kernel/drivers.c
index 3d569a485a1a..2b257e4f17df 100644
--- a/trunk/arch/parisc/kernel/drivers.c
+++ b/trunk/arch/parisc/kernel/drivers.c
@@ -424,7 +424,10 @@ struct parisc_device * create_tree_node(char id, struct device *parent)
 	/* make the generic dma mask a pointer to the parisc one */
 	dev->dev.dma_mask = &dev->dma_mask;
 	dev->dev.coherent_dma_mask = dev->dma_mask;
-	device_register(&dev->dev);
+	if (!device_register(&dev->dev)) {
+		kfree(dev);
+		return NULL;
+	}
 
 	return dev;
 }
@@ -850,8 +853,10 @@ static void print_parisc_device(struct parisc_device *dev)
  */
 void init_parisc_bus(void)
 {
-	bus_register(&parisc_bus_type);
-	device_register(&root);
+	if (!bus_register(&parisc_bus_type))
+		panic("Could not register PA-RISC bus type\n");
+	if (!device_register(&root))
+		panic("Could not register PA-RISC root device\n");
 	get_device(&root);
 }