From e2a267234c9b25dbdefaa928acbb2f31ebdeeda0 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 22 Nov 2012 16:18:13 +0100 Subject: [PATCH] --- yaml --- r: 342609 b: refs/heads/master c: e39ae8564410b8ad9057130ba71eeb6b1ef71d82 h: refs/heads/master i: 342607: 6ee79970f1dff8aaeb5e132a93b99c9e0485b7b6 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_intel.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0b2425b6028a..d80d4a0c770c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d144de9af28f23d28e4cdf28a08e25e9ad3b41c +refs/heads/master: e39ae8564410b8ad9057130ba71eeb6b1ef71d82 diff --git a/trunk/sound/pci/hda/hda_intel.c b/trunk/sound/pci/hda/hda_intel.c index 83be8550707a..4bb52da3ace9 100644 --- a/trunk/sound/pci/hda/hda_intel.c +++ b/trunk/sound/pci/hda/hda_intel.c @@ -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) {