From 3c934063c7174544c225616e87a4358dae47c91b Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Wed, 13 Jul 2011 17:58:13 -0300 Subject: [PATCH] --- yaml --- r: 261543 b: refs/heads/master c: 8afe9119e25809b044d9b5afbe2fb2853a5bd10c h: refs/heads/master i: 261541: ae676dc6f2fe9ef22c9fbdca3897f17ac0fcc709 261539: 53167ebe7164cb5a28d4154a054992ea7040ffd8 261535: f100f04274ac2ecbd7ae9ac1fd19eb2f91cdc41a v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/drxd_hard.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 98bf15033474..e5127f27f601 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b67693ccf23eb9cc57dd364f515057860a1f339 +refs/heads/master: 8afe9119e25809b044d9b5afbe2fb2853a5bd10c diff --git a/trunk/drivers/media/dvb/frontends/drxd_hard.c b/trunk/drivers/media/dvb/frontends/drxd_hard.c index d7afa3493f1e..2238bf0be959 100644 --- a/trunk/drivers/media/dvb/frontends/drxd_hard.c +++ b/trunk/drivers/media/dvb/frontends/drxd_hard.c @@ -909,14 +909,16 @@ static int load_firmware(struct drxd_state *state, const char *fw_name) return -EIO; } - state->microcode = kzalloc(fw->size, GFP_KERNEL); + state->microcode = kmalloc(fw->size, GFP_KERNEL); if (state->microcode == NULL) { - printk(KERN_ERR "drxd: firmware load failure: nomemory\n"); + 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; }