staging/vme_user: fix usage of the slave resources after they've been freed

buf_unalloc() frees the memory buffers allocated with vme_alloc_consistent.
The associated VME resource is needed in both vme_alloc_consistent and
vme_free_consistent; however the slave VME resources are being freed before
the calls to vme_free_consistent are made, which means the buffers
are never returned.

Fix this by freeing the VME resources only after the consistent buffers have
been returned.

Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index 36381489b797b045b1c595279557f572fd62a867..dc7175bdfcf96f13f9d60956bfb790fdf32d7260 100644 (file)
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -829,8 +829,8 @@ err_master:
 err_slave:
        while (i > SLAVE_MINOR) {
                i--;
-               vme_slave_free(image[i].resource);
                buf_unalloc(i);
+               vme_slave_free(image[i].resource);
        }
 err_class:
        cdev_del(vme_user_cdev);
@@ -855,8 +855,8 @@ static int __exit vme_user_remove(struct device *dev, int cur_bus, int cur_slot)
 
        for (i = SLAVE_MINOR; i < (SLAVE_MAX + 1); i++) {
                vme_slave_set(image[i].resource, 0, 0, 0, 0, VME_A32, 0);
-               vme_slave_free(image[i].resource);
                buf_unalloc(i);
+               vme_slave_free(image[i].resource);
        }
 
        /* Unregister device driver */