1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c
index 94967d0e0478..c555ca2aed0e 100644
--- a/drivers/media/rc/ir-hix5hd2.c
+++ b/drivers/media/rc/ir-hix5hd2.c
@@ -68,7 +68,7 @@
 
 struct hix5hd2_ir_priv {
         int                     irq;
-        void                    *base;
+        void volatile __iomem   *base;
         struct device           *dev;
         struct rc_dev           *rdev;
         struct regmap           *regmap;
@@ -218,8 +218,8 @@ static int hix5hd2_ir_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         priv->base = devm_ioremap_resource(dev, res);
-        if (IS_ERR(priv->base))
-                return PTR_ERR(priv->base);
+        if (IS_ERR((__force void *)priv->base))
+                return PTR_ERR((__force void *)priv->base);
 
         priv->irq = platform_get_irq(pdev, 0);
         if (priv->irq < 0) {