Staging: vme: Allocate memory buffers for master windows

For VME device I/O operations on master windows the user driver tends
to use kern_buf buffer array which is not allocated. This causes an error
when reading from master window device files.

Signed-off-by: Arthur Benilov <arthur.benilov@iba-group.com>
Signed-off-by: Vincent Bossier <vincent.bossier@iba-group.com>
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 0d404f1a27f4c5a4b1728c76738e44831e36aae8..c60c80fb241d506b079de6b3240fbacdd2f79d87 100644 (file)
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -738,6 +738,14 @@ static int __init vme_user_probe(struct device *dev, int cur_bus, int cur_slot)
                                "resource\n");
                        goto err_master;
                }
+               image[i].size_buf = PCI_BUF_SIZE;
+               image[i].kern_buf = kmalloc(image[i].size_buf, GFP_KERNEL);
+               if (image[i].kern_buf == NULL) {
+                       printk(KERN_WARNING "Unable to allocate memory for "
+                               "master window buffers\n");
+                       err = -ENOMEM;
+                       goto err_master_buf;
+               }
        }
 
        /* Create sysfs entries - on udev systems this creates the dev files */
@@ -791,6 +799,9 @@ 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--;
@@ -826,6 +837,9 @@ static int __exit vme_user_remove(struct device *dev, int cur_bus, int cur_slot)
        }
        class_destroy(vme_user_sysfs_class);
 
+       for (i = MASTER_MINOR; i < (MASTER_MAX + 1); i++)
+               kfree(image[i].kern_buf);
+
        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);