diff --git a/[refs] b/[refs] index 9f3469eb202c..8a77a1b01134 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1190024f0277a225c5926dbeb23306eb55035be +refs/heads/master: 53090aada474fe10052602ca3f46701591b666a5 diff --git a/trunk/drivers/media/dvb/frontends/drxd_hard.c b/trunk/drivers/media/dvb/frontends/drxd_hard.c index 88e46f4cdbb2..beb67759f824 100644 --- a/trunk/drivers/media/dvb/frontends/drxd_hard.c +++ b/trunk/drivers/media/dvb/frontends/drxd_hard.c @@ -914,14 +914,13 @@ static int load_firmware(struct drxd_state *state, const char *fw_name) return -EIO; } - state->microcode = kmalloc(fw->size, GFP_KERNEL); + state->microcode = kmemdup(fw->data, fw->size, GFP_KERNEL); if (state->microcode == NULL) { release_firmware(fw); printk(KERN_ERR "drxd: firmware load failure: no memory\n"); return -ENOMEM; } - memcpy(state->microcode, fw->data, fw->size); state->microcode_length = fw->size; release_firmware(fw); return 0;