diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2006-10-04 22:57:28 -0600 |
|---|---|---|
| committer | Matthew Wilcox <willy@parisc-linux.org> | 2006-10-07 05:18:15 -0600 |
| commit | ba0e427f215b1c58881a737f46d30ae03b83178c (patch) | |
| tree | 8e8b80ef439d4a5d096f9dbc78bafa2c57fe2cee | |
| parent | e11e30a063b515e95fb590f1558b5fea21273c63 (diff) | |
| download | kernel_samsung_smdk4412-ba0e427f215b1c58881a737f46d30ae03b83178c.zip kernel_samsung_smdk4412-ba0e427f215b1c58881a737f46d30ae03b83178c.tar.gz kernel_samsung_smdk4412-ba0e427f215b1c58881a737f46d30ae03b83178c.tar.bz2 | |
[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: Matthew Wilcox <matthew@wil.cx>
| -rw-r--r-- | arch/parisc/kernel/drivers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c index 2b257e4..d6c486e 100644 --- a/arch/parisc/kernel/drivers.c +++ b/arch/parisc/kernel/drivers.c @@ -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; } @@ -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); } |