From 9c78bafba083a76cd1f9007de58ca200c190397a Mon Sep 17 00:00:00 2001 From: Muli Ben-Yehuda Date: Tue, 17 Jul 2007 04:05:15 -0700 Subject: [PATCH] --- yaml --- r: 60867 b: refs/heads/master c: 2e32725c6ae8fa5345d9d095742e175ff4badd3b h: refs/heads/master i: 60865: ddfbc13dcde9b62fd56798f56f4450461cf297ad 60863: d562a4ff7b617f698eb143f75da844d32bc65e74 v: v3 --- [refs] | 2 +- trunk/sound/oss/trident.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dba8f6ed9bc1..88badce64786 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b20b9b4e985fcc48b4eea401cb289a856422c93 +refs/heads/master: 2e32725c6ae8fa5345d9d095742e175ff4badd3b diff --git a/trunk/sound/oss/trident.c b/trunk/sound/oss/trident.c index 2e3e78e1bf67..96adc47917aa 100644 --- a/trunk/sound/oss/trident.c +++ b/trunk/sound/oss/trident.c @@ -4454,9 +4454,9 @@ trident_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_id) /* Add H/W Volume Control By Matt Wu Jul. 06, 2001 */ card->hwvolctl = 0; - pci_dev_m1533 = pci_find_device(PCI_VENDOR_ID_AL, - PCI_DEVICE_ID_AL_M1533, - pci_dev_m1533); + pci_dev_m1533 = pci_get_device(PCI_VENDOR_ID_AL, + PCI_DEVICE_ID_AL_M1533, + pci_dev_m1533); rc = -ENODEV; if (pci_dev_m1533 == NULL) goto out_proc_fs; @@ -4470,6 +4470,8 @@ trident_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_id) bits &= 0xbf; /*clear bit 6 */ pci_write_config_byte(pci_dev_m1533, 0x7b, bits); } + pci_dev_put(pci_dev_m1533); + } else if (card->pci_id == PCI_DEVICE_ID_INTERG_5050) { card->alloc_pcm_channel = cyber_alloc_pcm_channel; card->alloc_rec_pcm_channel = cyber_alloc_pcm_channel;