diff --git a/[refs] b/[refs]
index 959682c35751..8f97f6256291 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5c21fc6155549e7f92fdeb039227f2b8e597e98
+refs/heads/master: 1daa38d379932bde0d2036c2e10ced3e8842b74f
diff --git a/trunk/drivers/staging/vme/devices/vme_user.c b/trunk/drivers/staging/vme/devices/vme_user.c
index 36381489b797..dc7175bdfcf9 100644
--- a/trunk/drivers/staging/vme/devices/vme_user.c
+++ b/trunk/drivers/staging/vme/devices/vme_user.c
@@ -829,8 +829,8 @@ static int __init vme_user_probe(struct device *dev, int cur_bus, int cur_slot)
 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 */