aboutsummaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorMuli Ben-Yehuda <muli@il.ibm.com>2007-07-17 04:05:15 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 10:23:10 -0700
commit2e32725c6ae8fa5345d9d095742e175ff4badd3b (patch)
tree13bca47bd024ce50ba230c9e58aa1667fa9a511b /sound/oss
parent3b20b9b4e985fcc48b4eea401cb289a856422c93 (diff)
downloadlinux-linaro-stable-2e32725c6ae8fa5345d9d095742e175ff4badd3b.tar.gz
OSS trident: replace deprecated pci_find_device with pci_get_device
Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/trident.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index 2e3e78e1bf67..96adc47917aa 100644
--- a/sound/oss/trident.c
+++ b/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;