diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-17 10:38:33 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-17 10:38:33 +0200 |
| commit | 84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0 (patch) | |
| tree | 6774218cb21d5ffbe704d6ad6beadc8559aaed1c /sound | |
| parent | 57e35381bc13e6f18ac1ec255ca61ba1a5103e13 (diff) | |
| parent | aa73aec6c385e2c797ac25cc7ccf0318031de7c8 (diff) | |
| download | linux-3.10-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.tar.gz linux-3.10-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.tar.bz2 linux-3.10-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/rawmidi.c | 4 | ||||
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index a7868ad4d53..cbbed0db9e5 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -535,13 +535,15 @@ static int snd_rawmidi_release(struct inode *inode, struct file *file) { struct snd_rawmidi_file *rfile; struct snd_rawmidi *rmidi; + struct module *module; rfile = file->private_data; rmidi = rfile->rmidi; rawmidi_release_priv(rfile); kfree(rfile); + module = rmidi->card->module; snd_card_file_remove(rmidi->card, file); - module_put(rmidi->card->module); + module_put(module); return 0; } diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 95148e58026..c16c5ba0fda 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -1747,6 +1747,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { "HP dv6", STAC_HP_DV5), SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3061, "HP dv6", STAC_HP_DV5), /* HP dv6-1110ax */ + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x363e, + "HP DV6", STAC_HP_DV5), SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010, "HP", STAC_HP_DV5), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233, |