summaryrefslogtreecommitdiff
path: root/drivers/misc/mic/vop/vop_vringh.c
diff options
context:
space:
mode:
authorVincent Whitchurch <vincent.whitchurch@axis.com>2019-02-22 16:30:47 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-02-26 12:53:55 +0100
commitba01cea2be8872591452e84acebede388c91249b (patch)
treeed6c66d94148191b934387db14c8b05813b61b45 /drivers/misc/mic/vop/vop_vringh.c
parent401c9bd10beef4b030eb9e34d16b5341dc6c683b (diff)
mic: vop: Cast pointers to unsigned long
Fix these on 32-bit: vop_vringh.c:711:13: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mic/vop/vop_vringh.c')
-rw-r--r--drivers/misc/mic/vop/vop_vringh.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/mic/vop/vop_vringh.c b/drivers/misc/mic/vop/vop_vringh.c
index 0bac8bce933c..73d9fe6bc18d 100644
--- a/drivers/misc/mic/vop/vop_vringh.c
+++ b/drivers/misc/mic/vop/vop_vringh.c
@@ -712,16 +712,17 @@ static int vop_vringh_copy(struct vop_vdev *vdev, struct vringh_kiov *iov,
while (len && iov->i < iov->used) {
struct kvec *kiov = &iov->iov[iov->i];
+ unsigned long daddr = (unsigned long)kiov->iov_base;
partlen = min(kiov->iov_len, len);
if (read)
ret = vop_virtio_copy_to_user(vdev, ubuf, partlen,
- (u64)kiov->iov_base,
+ daddr,
kiov->iov_len,
vr_idx);
else
ret = vop_virtio_copy_from_user(vdev, ubuf, partlen,
- (u64)kiov->iov_base,
+ daddr,
kiov->iov_len,
vr_idx);
if (ret) {