Skip to content

Commit

Permalink
[PA-RISC] Fix boot breakage
Browse files Browse the repository at this point in the history
Conditionals were the wrong way around.  Turns out I was booting the
wrong kernel when testing the original fix.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
  • Loading branch information
Matthew Wilcox authored and Matthew Wilcox committed Oct 7, 2006
1 parent e11e30a commit ba0e427
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/parisc/kernel/drivers.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
dev->dev.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);
return NULL;
}
Expand Down Expand Up @@ -853,9 +853,9 @@ static void print_parisc_device(struct parisc_device *dev)
*/
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");
if (!device_register(&root))
if (device_register(&root))
panic("Could not register PA-RISC root device\n");
get_device(&root);
}
Expand Down

0 comments on commit ba0e427

Please sign in to comment.