Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 21729
b: refs/heads/master
c: 31dcbf9
h: refs/heads/master
i:
  21727: 35d4433
v: v3
  • Loading branch information
Duncan Sands authored and Linus Torvalds committed Mar 21, 2006
1 parent 157b808 commit 05a6aad
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: ae24601b47c3f4a56545ef4cd4e7c821ac1db598
refs/heads/master: 31dcbf994b9eda784c620c8caa3a9dc67a9d0045
10 changes: 5 additions & 5 deletions trunk/drivers/media/video/cx88/cx88-alsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,11 @@ static int __devinit snd_cx88_create(snd_card_t *card, struct pci_dev *pci,
chip = (snd_cx88_card_t *) card->private_data;

core = cx88_core_get(pci);
if (NULL == core) {
err = -EINVAL;
kfree (chip);
return err;
}

if (!pci_dma_supported(pci,0xffffffff)) {
dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
Expand All @@ -688,11 +693,6 @@ static int __devinit snd_cx88_create(snd_card_t *card, struct pci_dev *pci,
spin_lock_init(&chip->reg_lock);

cx88_reset(core);
if (NULL == core) {
err = -EINVAL;
kfree (chip);
return err;
}
chip->core = core;

/* get irq */
Expand Down

0 comments on commit 05a6aad

Please sign in to comment.