Staging: crystalhd: Fix different address spaces warning from sparse in crystalhd_misc.c

This patch fixes following sparse warning in crystalhd_misc.c
WARNING: incorrect type in argument

Signed-off-by: Monam Agarwal <monamagarwal123@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.h b/drivers/staging/crystalhd/crystalhd_lnx.h
index 816e1cd5db620401b559c36173657d156706cb6a..49e1ef3a19af4e9bdf5903d1a8b79a6295df2b90 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_lnx.h
+++ b/drivers/staging/crystalhd/crystalhd_lnx.h
@@ -58,11 +58,11 @@ struct crystalhd_adp {
 
        unsigned long           pci_mem_start;
        uint32_t                pci_mem_len;
-       void                    *addr;
+       void __iomem            *addr;
 
        unsigned long           pci_i2o_start;
        uint32_t                pci_i2o_len;
-       void                    *i2o_addr;
+       void __iomem            *i2o_addr;
 
        unsigned int            drv_data;
        unsigned int            dmabits;        /* 32 | 64 */

diff --git a/drivers/staging/crystalhd/crystalhd_misc.c b/drivers/staging/crystalhd/crystalhd_misc.c
index c3d024406337c35c9a1072df1b78dc4773c0fb0b..3aabf75b7d97573b70f40a98982e5caef48427cc 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_misc.c
+++ b/drivers/staging/crystalhd/crystalhd_misc.c
@@ -740,7 +740,7 @@ enum BC_STATUS crystalhd_map_dio(struct crystalhd_adp *adp, void *ubuff,
        dio->fb_size = ubuff_sz & 0x03;
        if (dio->fb_size) {
                res = copy_from_user(dio->fb_va,
-                                    (void *)(uaddr + count - dio->fb_size),
+                                    (void __user *)(uaddr + count - dio->fb_size),
                                     dio->fb_size);
                if (res) {
                        BCMLOG_ERR("failed %d to copy %u fill bytes from %p\n",