Skip to content

Commit a688362

Browse files
committed
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
2 parents 18dfd1c + 680ad31 commit a688362

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

arch/mips/alchemy/common/setup.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ phys_addr_t fixup_bigphys_addr(phys_addr_t phys_addr, phys_addr_t size)
9494
return phys_addr;
9595
}
9696

97-
static inline unsigned long io_remap_pfn_range_pfn(unsigned long pfn,
98-
unsigned long size)
97+
unsigned long io_remap_pfn_range_pfn(unsigned long pfn, unsigned long size)
9998
{
10099
phys_addr_t phys_addr = fixup_bigphys_addr(pfn << PAGE_SHIFT, size);
101100

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,8 @@ static void ip22_check_gio(int slotno, unsigned long addr, int irq)
372372
gio_dev->resource.flags = IORESOURCE_MEM;
373373
gio_dev->irq = irq;
374374
dev_set_name(&gio_dev->dev, "%d", slotno);
375-
gio_device_register(gio_dev);
375+
if (gio_device_register(gio_dev))
376+
gio_dev_put(gio_dev);
376377
} else
377378
printk(KERN_INFO "GIO: slot %d : Empty\n", slotno);
378379
}

0 commit comments

Comments
 (0)