]> err.no Git - linux-2.6/commitdiff
[PA-RISC] Fix boot breakage
authorMatthew Wilcox <matthew@wil.cx>
Thu, 5 Oct 2006 04:57:28 +0000 (22:57 -0600)
committerMatthew Wilcox <willy@parisc-linux.org>
Sat, 7 Oct 2006 11:18:15 +0000 (05:18 -0600)
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>
arch/parisc/kernel/drivers.c

index 2b257e4f17df28da51a9495d4beeaf9efcf72885..d6c486e9501ced09bded130f5f4049ee1d3a0c30 100644 (file)
@@ -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);
 }