Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/parisc/kernel/drivers.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

}