diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 975e1cc75edb55f9dcd19530eb08912b220e2641..b8fdc57a733515b8b0b031da68ac5a9f8eda74ae 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -331,7 +331,7 @@ static inline void iounmap(void __iomem *addr)
 #ifndef CONFIG_GENERIC_IOMAP
 static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
 {
-	return (void __iomem *) port;
+	return PCI_IOBASE + (port & IO_SPACE_LIMIT);
 }
 
 static inline void ioport_unmap(void __iomem *p)