diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-22 10:18:13 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-11-22 11:48:03 -0500 |
commit | e39ae8564410b8ad9057130ba71eeb6b1ef71d82 (patch) | |
tree | e363f9522090ad84ece291ba5dc67fa9721bcef8 /sound/pci | |
parent | 0d144de9af28f23d28e4cdf28a08e25e9ad3b41c (diff) |
ALSA: hda - Don't release firmware when CONFIG_PM is set
The new firmware code tries to re-read the formerly read firmware
files before suspend. Thus it's wiser to keep the "patch" firmware in
the driver for avoiding this unnecessary re-reading.
Of course, this will consume a bit of memory for unused stuff, but
the patch fw is supposed to be fairly small, so it's more benefit in
the end.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 83be8550707a..4bb52da3ace9 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -3507,8 +3507,10 @@ static int DELAYED_INIT_MARK azx_probe_continue(struct azx *chip) | |||
3507 | chip->fw->data); | 3507 | chip->fw->data); |
3508 | if (err < 0) | 3508 | if (err < 0) |
3509 | goto out_free; | 3509 | goto out_free; |
3510 | #ifndef CONFIG_PM | ||
3510 | release_firmware(chip->fw); /* no longer needed */ | 3511 | release_firmware(chip->fw); /* no longer needed */ |
3511 | chip->fw = NULL; | 3512 | chip->fw = NULL; |
3513 | #endif | ||
3512 | } | 3514 | } |
3513 | #endif | 3515 | #endif |
3514 | if ((probe_only[dev] & 1) == 0) { | 3516 | if ((probe_only[dev] & 1) == 0) { |