Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39007
b: refs/heads/master
c: 1070c96
h: refs/heads/master
i:
  39005: 40eabd3
  39003: 5b8c29f
  38999: c239470
  38991: e03e508
  38975: dc63371
v: v3
  • Loading branch information
Matthew Wilcox authored and Matthew Wilcox committed Oct 5, 2006
1 parent e14b4f6 commit 3eaee1d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f64ef295032d07345ca26bf4876a1577c4dccb37
refs/heads/master: 1070c9655b90016ec4c9b59c402292e57ee15885
11 changes: 8 additions & 3 deletions trunk/arch/parisc/kernel/drivers.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit 3eaee1d

Please sign in to comment.