diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-10-15 14:27:03 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-10-15 14:27:03 -0700 |
| commit | 1483e9ab72de9055a4ab56044686ce944a80b0b3 (patch) | |
| tree | f34fe0bda3fc123b40e3c47aa0cc4c714f266dff /arch/arm | |
| parent | 493a40ec29798c51f4f65a74b46f85b7e742e012 (diff) | |
| parent | 88018d8d877a56e238c726ccd8c22e9b1bf58051 (diff) | |
| download | kernel_samsung_tuna-1483e9ab72de9055a4ab56044686ce944a80b0b3.zip kernel_samsung_tuna-1483e9ab72de9055a4ab56044686ce944a80b0b3.tar.gz kernel_samsung_tuna-1483e9ab72de9055a4ab56044686ce944a80b0b3.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-omap/omap_rpmsg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/omap_rpmsg.c b/arch/arm/plat-omap/omap_rpmsg.c index 63d7eb7..0cfd716 100644 --- a/arch/arm/plat-omap/omap_rpmsg.c +++ b/arch/arm/plat-omap/omap_rpmsg.c @@ -329,13 +329,13 @@ static void omap_rpmsg_del_vqs(struct virtio_device *vdev) kfree(rpvq); } - iounmap(rpdev->buf_mapped); - if (rpdev->mbox) omap_mbox_put(rpdev->mbox, &rpdev->nb); if (rpdev->rproc) rproc_put(rpdev->rproc); + + iounmap(rpdev->buf_mapped); } static int omap_rpmsg_find_vqs(struct virtio_device *vdev, unsigned nvqs, |