Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf42d543 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rpmsg-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg 

Pull rpmsg fix from Ohad Ben-Cohen:
 "A quick rpmsg fix from Fernando, fixing two buggy invocations of
  dma_free_coherent"

* tag 'rpmsg-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg:
  rpmsg: fix dma_free_coherent dev parameter
parents 4b92c17e eeb0074f

drivers/rpmsg/virtio_rpmsg_bus.c

+3 −3
Original line number Diff line number Diff line
@@ -1008,8 +1008,8 @@ static int rpmsg_probe(struct virtio_device *vdev) 
	return 0;



free_coherent:

	dma_free_coherent(vdev->dev.parent, RPMSG_TOTAL_BUF_SPACE, bufs_va,

					vrp->bufs_dma);

	dma_free_coherent(vdev->dev.parent->parent, RPMSG_TOTAL_BUF_SPACE,

					bufs_va, vrp->bufs_dma);

vqs_del:

	vdev->config->del_vqs(vrp->vdev);

free_vrp:
@@ -1043,7 +1043,7 @@ static void __devexit rpmsg_remove(struct virtio_device *vdev) 


	vdev->config->del_vqs(vrp->vdev);



	dma_free_coherent(vdev->dev.parent, RPMSG_TOTAL_BUF_SPACE,

	dma_free_coherent(vdev->dev.parent->parent, RPMSG_TOTAL_BUF_SPACE,

					vrp->rbufs, vrp->bufs_dma);



	kfree(vrp);