diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-22 10:08:40 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-22 10:08:40 -0700 |
commit | 3eb9992caff10b62cf0ed0bcb1667a58b13188fa (patch) | |
tree | abe4b4b586978773e2df21898eda611bc6eb822c /drivers/staging/vme/devices | |
parent | e347fa5f4271769bc31fb462631c213aa3824588 (diff) | |
parent | a798c10faf62a505d24e5f6213fbaf904a39623f (diff) | |
download | op-kernel-dev-3eb9992caff10b62cf0ed0bcb1667a58b13188fa.zip op-kernel-dev-3eb9992caff10b62cf0ed0bcb1667a58b13188fa.tar.gz |
Merge 3.15-rc2 into staging-next
This resolves a bunch of merge errors with other fixes that are already
in Linus's tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vme/devices')
-rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index 5fa7f83..2d84972 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -776,7 +776,8 @@ static int vme_user_probe(struct vme_dev *vdev) image[i].kern_buf = kmalloc(image[i].size_buf, GFP_KERNEL); if (image[i].kern_buf == NULL) { err = -ENOMEM; - goto err_master_buf; + vme_master_free(image[i].resource); + goto err_master; } } @@ -820,8 +821,6 @@ static int vme_user_probe(struct vme_dev *vdev) return 0; - /* Ensure counter set correcty to destroy all sysfs devices */ - i = VME_DEVS; err_sysfs: while (i > 0) { i--; @@ -831,12 +830,10 @@ err_sysfs: /* Ensure counter set correcty to unalloc all master windows */ i = MASTER_MAX + 1; -err_master_buf: - for (i = MASTER_MINOR; i < (MASTER_MAX + 1); i++) - kfree(image[i].kern_buf); err_master: while (i > MASTER_MINOR) { i--; + kfree(image[i].kern_buf); vme_master_free(image[i].resource); } |