Commit ba0e427f authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Matthew Wilcox

[PA-RISC] Fix boot breakage

Conditionals were the wrong way around.  Turns out I was booting the
wrong kernel when testing the original fix.
Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
parent e11e30a0
...@@ -424,7 +424,7 @@ struct parisc_device * create_tree_node(char id, struct device *parent) ...@@ -424,7 +424,7 @@ struct parisc_device * create_tree_node(char id, struct device *parent)
/* make the generic dma mask a pointer to the parisc one */ /* make the generic dma mask a pointer to the parisc one */
dev->dev.dma_mask = &dev->dma_mask; dev->dev.dma_mask = &dev->dma_mask;
dev->dev.coherent_dma_mask = dev->dma_mask; dev->dev.coherent_dma_mask = dev->dma_mask;
if (!device_register(&dev->dev)) { if (device_register(&dev->dev)) {
kfree(dev); kfree(dev);
return NULL; return NULL;
} }
...@@ -853,9 +853,9 @@ static void print_parisc_device(struct parisc_device *dev) ...@@ -853,9 +853,9 @@ static void print_parisc_device(struct parisc_device *dev)
*/ */
void init_parisc_bus(void) void init_parisc_bus(void)
{ {
if (!bus_register(&parisc_bus_type)) if (bus_register(&parisc_bus_type))
panic("Could not register PA-RISC bus type\n"); panic("Could not register PA-RISC bus type\n");
if (!device_register(&root)) if (device_register(&root))
panic("Could not register PA-RISC root device\n"); panic("Could not register PA-RISC root device\n");
get_device(&root); get_device(&root);
} }
......
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