diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 10:45:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 10:45:31 +0200 |
| commit | 8c285645ab3b05942124020b5f0b89d3b539823a (patch) | |
| tree | db15972689f7f0b794244294836a1233beb37dd4 /sound/usb/6fire/firmware.c | |
| parent | ASoC: sgtl5000: fix cache handling (diff) | |
| parent | ASoC: Acknowledge WM8996 interrupts before acting on them (diff) | |
| download | linux-8c285645ab3b05942124020b5f0b89d3b539823a.tar.xz linux-8c285645ab3b05942124020b5f0b89d3b539823a.zip | |
Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'sound/usb/6fire/firmware.c')
| -rw-r--r-- | sound/usb/6fire/firmware.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c index d47beffedb0f..1e3ae3327dd3 100644 --- a/sound/usb/6fire/firmware.c +++ b/sound/usb/6fire/firmware.c @@ -227,6 +227,7 @@ static int usb6fire_fw_ezusb_upload( ret = usb6fire_fw_ihex_init(fw, rec); if (ret < 0) { kfree(rec); + release_firmware(fw); snd_printk(KERN_ERR PREFIX "error validating ezusb " "firmware %s.\n", fwname); return ret; @@ -269,7 +270,6 @@ static int usb6fire_fw_ezusb_upload( data = 0x00; /* resume ezusb cpu */ ret = usb6fire_fw_ezusb_write(device, 0xa0, 0xe600, &data, 1); if (ret < 0) { - release_firmware(fw); snd_printk(KERN_ERR PREFIX "unable to upload ezusb " "firmware %s: end message.\n", fwname); return ret; |