Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / bluetooth / bcm203x.c

diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c
index b0c84c19f442e3ad41fc7340b50e33366c75adcd..8b1b643a519b330a8119ad5bde789ec105edfdfc 100644 (file)
--- a/drivers/bluetooth/bcm203x.c
+++ b/drivers/bluetooth/bcm203x.c
@@ -224,7 +224,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
 
        BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);
 
-       data->fw_data = kmalloc(firmware->size, GFP_KERNEL);
+       data->fw_data = kmemdup(firmware->data, firmware->size, GFP_KERNEL);
        if (!data->fw_data) {
                BT_ERR("Can't allocate memory for firmware image");
                release_firmware(firmware);
@@ -234,7 +234,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
                return -ENOMEM;
        }
 
-       memcpy(data->fw_data, firmware->data, firmware->size);
        data->fw_size = firmware->size;
        data->fw_sent = 0;