1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/rc/st_rc.c b/drivers/media/rc/st_rc.c
index e309441a266d..0e758ae2e529 100644
--- a/drivers/media/rc/st_rc.c
+++ b/drivers/media/rc/st_rc.c
@@ -22,8 +22,8 @@ struct st_rc_device {
         int                             irq;
         int                             irq_wake;
         struct clk                      *sys_clock;
-        void                            *base;  /* Register base address */
-        void                            *rx_base;/* RX Register base address */
+        volatile void __iomem           *base;  /* Register base address */
+        volatile void __iomem           *rx_base;/* RX Register base address */
         struct rc_dev                   *rdev;
         bool                            overclocking;
         int                             sample_mult;
@@ -267,8 +267,8 @@ static int st_rc_probe(struct platform_device *pdev)
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
         rc_dev->base = devm_ioremap_resource(dev, res);
-        if (IS_ERR(rc_dev->base)) {
-                ret = PTR_ERR(rc_dev->base);
+        if (IS_ERR((__force void *)rc_dev->base)) {
+                ret = PTR_ERR((__force void *)rc_dev->base);
                 goto err;
         }