Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / drivers / staging / comedi / drivers / usbduxfast.c

diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 0d72c416e73b5630aa1dda9843702bc2c746b939..29c3c016b93a6458f625397f098458a58e37208d 100644 (file)
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -1368,13 +1368,12 @@ static int firmwareUpload(struct usbduxfastsub_s *usbduxfastsub,
        }
 
        /* we generate a local buffer for the firmware */
-       fwBuf = kzalloc(sizeFirmware, GFP_KERNEL);
+       fwBuf = kmemdup(firmwareBinary, sizeFirmware, GFP_KERNEL);
        if (!fwBuf) {
                dev_err(&usbduxfastsub->interface->dev,
                        "comedi_: mem alloc for firmware failed\n");
                return -ENOMEM;
        }
-       memcpy(fwBuf, firmwareBinary, sizeFirmware);
 
        ret = usbduxfastsub_stop(usbduxfastsub);
        if (ret < 0) {