Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[sfrench/cifs-2.6.git] / drivers / staging / line6 / variax.c

diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c
index 28eb89983f36be2ab088ccdf17fa2345a000a080..58ddbe6393ff7e3bf2ba2e17c4166c423fcafd97 100644 (file)
--- a/drivers/staging/line6/variax.c
+++ b/drivers/staging/line6/variax.c
@@ -486,7 +486,8 @@ int variax_init(struct usb_interface *interface,
                return err;
        }
 
-       variax->buffer_activate = kmalloc(sizeof(variax_activate), GFP_KERNEL);
+       variax->buffer_activate = kmemdup(variax_activate,
+                                         sizeof(variax_activate), GFP_KERNEL);
 
        if (variax->buffer_activate == NULL) {
                dev_err(&interface->dev, "Out of memory\n");
@@ -494,8 +495,6 @@ int variax_init(struct usb_interface *interface,
                return -ENOMEM;
        }
 
-       memcpy(variax->buffer_activate, variax_activate,
-              sizeof(variax_activate));
        init_timer(&variax->activate_timer);
 
        /* create sysfs entries: */