summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-02-10 17:39:20 +0100
committerTakashi Iwai <tiwai@suse.de>2011-02-10 17:39:20 +0100
commit41a63f18d339ae6aefe73d45a8147f63f3439b30 (patch)
tree719c25027f854c1bdb81dc039d5ddd87463d2c01 /sound/pci
parent11839aed21881d7edd65dd79f22a8eb18426f672 (diff)
downloadlinux-stable-41a63f18d339ae6aefe73d45a8147f63f3439b30.tar.gz
linux-stable-41a63f18d339ae6aefe73d45a8147f63f3439b30.tar.bz2
linux-stable-41a63f18d339ae6aefe73d45a8147f63f3439b30.zip
ALSA: hda - Don't handle empty patch files
When an empty string is passed to patch option, the driver should ignore it. Otherwise it gets an error by trying to load it. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_intel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 2e91a991eb15..0baffcdee8f9 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2703,7 +2703,7 @@ static int __devinit azx_probe(struct pci_dev *pci,
if (err < 0)
goto out_free;
#ifdef CONFIG_SND_HDA_PATCH_LOADER
- if (patch[dev]) {
+ if (patch[dev] && *patch[dev]) {
snd_printk(KERN_ERR SFX "Applying patch firmware '%s'\n",
patch[dev]);
err = snd_hda_load_patch(chip->bus, patch[dev]);