Skip to content

Commit

Permalink
Merge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6
Browse files Browse the repository at this point in the history
* 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6:
  [PARISC] More pt_regs removal
  [PARISC] pdc_init no longer exists
  [PARISC] Make firmware calls irqsafe-ish...
  [PA-RISC] Fix boot breakage
  [PARISC] Use set_irq_regs
  • Loading branch information
Linus Torvalds committed Oct 8, 2006
2 parents c7111c1 + c7753f1 commit ff3df54
Show file tree
Hide file tree
Showing 6 changed files with 177 additions and 131 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
Loading

0 comments on commit ff3df54

Please sign in to comment.