diff options
author | Matthew Wilcox <matthew@wil.cx> | 2006-10-05 00:57:28 -0400 |
---|---|---|
committer | Matthew Wilcox <willy@parisc-linux.org> | 2006-10-07 07:18:15 -0400 |
commit | ba0e427f215b1c58881a737f46d30ae03b83178c (patch) | |
tree | 8e8b80ef439d4a5d096f9dbc78bafa2c57fe2cee /arch/parisc/kernel/drivers.c | |
parent | e11e30a063b515e95fb590f1558b5fea21273c63 (diff) |
[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>
Diffstat (limited to 'arch/parisc/kernel/drivers.c')
-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 2b257e4f17df..d6c486e9501c 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) | |||
424 | /* make the generic dma mask a pointer to the parisc one */ | 424 | /* make the generic dma mask a pointer to the parisc one */ |
425 | dev->dev.dma_mask = &dev->dma_mask; | 425 | dev->dev.dma_mask = &dev->dma_mask; |
426 | dev->dev.coherent_dma_mask = dev->dma_mask; | 426 | dev->dev.coherent_dma_mask = dev->dma_mask; |
427 | if (!device_register(&dev->dev)) { | 427 | if (device_register(&dev->dev)) { |
428 | kfree(dev); | 428 | kfree(dev); |
429 | return NULL; | 429 | return NULL; |
430 | } | 430 | } |
@@ -853,9 +853,9 @@ static void print_parisc_device(struct parisc_device *dev) | |||
853 | */ | 853 | */ |
854 | void init_parisc_bus(void) | 854 | void init_parisc_bus(void) |
855 | { | 855 | { |
856 | if (!bus_register(&parisc_bus_type)) | 856 | if (bus_register(&parisc_bus_type)) |
857 | panic("Could not register PA-RISC bus type\n"); | 857 | panic("Could not register PA-RISC bus type\n"); |
858 | if (!device_register(&root)) | 858 | if (device_register(&root)) |
859 | panic("Could not register PA-RISC root device\n"); | 859 | panic("Could not register PA-RISC root device\n"); |
860 | get_device(&root); | 860 | get_device(&root); |
861 | } | 861 | } |