diff options
| author | Monam Agarwal <monamagarwal123@gmail.com> | 2014-03-05 06:05:51 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-07 15:16:26 -0800 |
| commit | 6df1a83ba75d71024e489b67584d298b24305fcf (patch) | |
| tree | 870515e6a7067027e7ee19dc9efb2708ff677d67 /drivers | |
| parent | 421343a4382111d3e9216b8355f1ce0113bb9567 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.h | 4 | ||||
| -rw-r--r-- | drivers/staging/crystalhd/crystalhd_misc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.h b/drivers/staging/crystalhd/crystalhd_lnx.h index 816e1cd5db6..49e1ef3a19a 100644 --- 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 c3d02440633..3aabf75b7d9 100644 --- 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", |