Skip to content

Commit 6ba1b00

Browse files
committed
Merge tag 'asm-generic-fixes-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic into master
Pull asm-generic bugfix from Arnd Bergmann: "A single bugfix for a regression introduced through a typo in the v5.8 merge window, leading to incorrect data returned from inl() on some architectures" * tag 'asm-generic-fixes-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: io: Fix return type of _inb and _inl
2 parents fb896c9 + 214ba35 commit 6ba1b00

File tree

1 file changed

+2
-2
lines changed
  • include/asm-generic

1 file changed

+2
-2
lines changed

include/asm-generic/io.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ static inline void writesq(volatile void __iomem *addr, const void *buffer,
456456

457457
#if !defined(inb) && !defined(_inb)
458458
#define _inb _inb
459-
static inline u16 _inb(unsigned long addr)
459+
static inline u8 _inb(unsigned long addr)
460460
{
461461
u8 val;
462462

@@ -482,7 +482,7 @@ static inline u16 _inw(unsigned long addr)
482482

483483
#if !defined(inl) && !defined(_inl)
484484
#define _inl _inl
485-
static inline u16 _inl(unsigned long addr)
485+
static inline u32 _inl(unsigned long addr)
486486
{
487487
u32 val;
488488

0 commit comments

Comments
 (0)