Merge branch 'linus' into x86/urgent

[mv-sheeva.git] / drivers / rpmsg / virtio_rpmsg_bus.c

diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
index 1e8b8b618674cd70824a8abf5941fda1a8d142e2..75506ec2840e2ec4d1e331f209377d874f604386 100644 (file)
--- a/drivers/rpmsg/virtio_rpmsg_bus.c
+++ b/drivers/rpmsg/virtio_rpmsg_bus.c
@@ -798,7 +798,8 @@ static void rpmsg_recv_done(struct virtqueue *rvq)
        else
                dev_warn(dev, "msg received with no recepient\n");
 
-       sg_init_one(&sg, msg, sizeof(*msg) + len);
+       /* publish the real size of the buffer */
+       sg_init_one(&sg, msg, RPMSG_BUF_SIZE);
 
        /* add the buffer back to the remote processor's virtqueue */
        err = virtqueue_add_buf(vrp->rvq, &sg, 0, 1, msg, GFP_KERNEL);
@@ -915,8 +916,8 @@ static int rpmsg_probe(struct virtio_device *vdev)
        if (!bufs_va)
                goto vqs_del;
 
-       dev_dbg(&vdev->dev, "buffers: va %p, dma 0x%x\n", bufs_va,
-                                               vrp->bufs_dma);
+       dev_dbg(&vdev->dev, "buffers: va %p, dma 0x%llx\n", bufs_va,
+                                       (unsigned long long)vrp->bufs_dma);
 
        /* half of the buffers is dedicated for RX */
        vrp->rbufs = bufs_va;