Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 37622
b: refs/heads/master
c: 14fef64
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Oct 1, 2006
1 parent 70faef5 commit 91b17c6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f2443ab6c485701576e9116ee44817e66adafd5a
refs/heads/master: 14fef6414be49d59f4784eeef8d9c3f468993205
6 changes: 4 additions & 2 deletions trunk/sound/oss/via82cxxx_audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1547,7 +1547,7 @@ static int via_mixer_open (struct inode *inode, struct file *file)

DPRINTK ("ENTER\n");

while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
while ((pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
drvr = pci_dev_driver (pdev);
if (drvr == &via_driver) {
assert (pci_get_drvdata (pdev) != NULL);
Expand All @@ -1562,6 +1562,7 @@ static int via_mixer_open (struct inode *inode, struct file *file)
return -ENODEV;

match:
pci_dev_put(pdev);
file->private_data = card->ac97;

DPRINTK ("EXIT, returning 0\n");
Expand Down Expand Up @@ -3245,7 +3246,7 @@ static int via_dsp_open (struct inode *inode, struct file *file)
}

card = NULL;
while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
while ((pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
drvr = pci_dev_driver (pdev);
if (drvr == &via_driver) {
assert (pci_get_drvdata (pdev) != NULL);
Expand All @@ -3264,6 +3265,7 @@ static int via_dsp_open (struct inode *inode, struct file *file)
return -ENODEV;

match:
pci_dev_put(pdev);
if (nonblock) {
if (!mutex_trylock(&card->open_mutex)) {
DPRINTK ("EXIT, returning -EAGAIN\n");
Expand Down

0 comments on commit 91b17c6

Please sign in to comment.