diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-19 14:03:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-19 14:03:13 -0400 |
| commit | cf42d543e54143fbbaaa9972c5e69bc21a0b77dd (patch) | |
| tree | 19b99843dfe17185f4ccb81489536efcad1d2262 /drivers | |
| parent | 4b92c17e1dc10b6fec44241228c695ef93b504ea (diff) | |
| parent | eeb0074f36d1ab0729d06f1c56add9c7799679e2 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rpmsg/virtio_rpmsg_bus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 590cfafc7c17..1859f71372e2 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c | |||
| @@ -1008,8 +1008,8 @@ static int rpmsg_probe(struct virtio_device *vdev) | |||
| 1008 | return 0; | 1008 | return 0; |
| 1009 | 1009 | ||
| 1010 | free_coherent: | 1010 | free_coherent: |
| 1011 | dma_free_coherent(vdev->dev.parent, RPMSG_TOTAL_BUF_SPACE, bufs_va, | 1011 | dma_free_coherent(vdev->dev.parent->parent, RPMSG_TOTAL_BUF_SPACE, |
| 1012 | vrp->bufs_dma); | 1012 | bufs_va, vrp->bufs_dma); |
| 1013 | vqs_del: | 1013 | vqs_del: |
| 1014 | vdev->config->del_vqs(vrp->vdev); | 1014 | vdev->config->del_vqs(vrp->vdev); |
| 1015 | free_vrp: | 1015 | free_vrp: |
| @@ -1043,7 +1043,7 @@ static void __devexit rpmsg_remove(struct virtio_device *vdev) | |||
| 1043 | 1043 | ||
| 1044 | vdev->config->del_vqs(vrp->vdev); | 1044 | vdev->config->del_vqs(vrp->vdev); |
| 1045 | 1045 | ||
| 1046 | dma_free_coherent(vdev->dev.parent, RPMSG_TOTAL_BUF_SPACE, | 1046 | dma_free_coherent(vdev->dev.parent->parent, RPMSG_TOTAL_BUF_SPACE, |
| 1047 | vrp->rbufs, vrp->bufs_dma); | 1047 | vrp->rbufs, vrp->bufs_dma); |
| 1048 | 1048 | ||
| 1049 | kfree(vrp); | 1049 | kfree(vrp); |