Commit a688362b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips-fixes_6.19_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Thomas Bogendoerfer:

 - Fix build error for Alchemy

 - Fix reference leak

* tag 'mips-fixes_6.19_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Fix a reference leak bug in ip22_check_gio()
  MIPS: Alchemy: Remove bogus static/inline specifiers
parents 18dfd1cb 680ad315

arch/mips/alchemy/common/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -94,8 +94,7 @@ phys_addr_t fixup_bigphys_addr(phys_addr_t phys_addr, phys_addr_t size) 
	return phys_addr;

}



static inline unsigned long io_remap_pfn_range_pfn(unsigned long pfn,

		unsigned long size)

unsigned long io_remap_pfn_range_pfn(unsigned long pfn, unsigned long size)

{

	phys_addr_t phys_addr = fixup_bigphys_addr(pfn << PAGE_SHIFT, size);

arch/mips/sgi-ip22/ip22-gio.c

+2 −1
Original line number Diff line number Diff line
@@ -372,7 +372,8 @@ static void ip22_check_gio(int slotno, unsigned long addr, int irq) 
		gio_dev->resource.flags = IORESOURCE_MEM;

		gio_dev->irq = irq;

		dev_set_name(&gio_dev->dev, "%d", slotno);

		gio_device_register(gio_dev);

		if (gio_device_register(gio_dev))

			gio_dev_put(gio_dev);

	} else

		printk(KERN_INFO "GIO: slot %d : Empty\n", slotno);

}