ALSA: hda - Don't release firmware when CONFIG_PM is set
authorTakashi Iwai <tiwai@suse.de>
Thu, 22 Nov 2012 15:18:13 +0000 (16:18 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 22 Nov 2012 16:48:03 +0000 (17:48 +0100)
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>
sound/pci/hda/hda_intel.c

index 83be855..4bb52da 100644 (file)
@@ -3507,8 +3507,10 @@ static int DELAYED_INIT_MARK azx_probe_continue(struct azx *chip)
                                         chip->fw->data);
                if (err < 0)
                        goto out_free;
+#ifndef CONFIG_PM
                release_firmware(chip->fw); /* no longer needed */
                chip->fw = NULL;
+#endif
        }
 #endif
        if ((probe_only[dev] & 1) == 0) {