Commit 6ba1b005 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-fixes-5.8' of...

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
parents fb896c91 214ba358
...@@ -456,7 +456,7 @@ static inline void writesq(volatile void __iomem *addr, const void *buffer, ...@@ -456,7 +456,7 @@ static inline void writesq(volatile void __iomem *addr, const void *buffer,
#if !defined(inb) && !defined(_inb) #if !defined(inb) && !defined(_inb)
#define _inb _inb #define _inb _inb
static inline u16 _inb(unsigned long addr) static inline u8 _inb(unsigned long addr)
{ {
u8 val; u8 val;
...@@ -482,7 +482,7 @@ static inline u16 _inw(unsigned long addr) ...@@ -482,7 +482,7 @@ static inline u16 _inw(unsigned long addr)
#if !defined(inl) && !defined(_inl) #if !defined(inl) && !defined(_inl)
#define _inl _inl #define _inl _inl
static inline u16 _inl(unsigned long addr) static inline u32 _inl(unsigned long addr)
{ {
u32 val; u32 val;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment