Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 226421
b: refs/heads/master
c: 4f77b86
h: refs/heads/master
i:
  226419: 7048915
v: v3
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Jan 4, 2011
1 parent 31f84f1 commit 675f26e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: 9d1da730ee17e712c25c0b1e51653048f92d2385
refs/heads/master: 4f77b86c665ff6a167edfdf152ebfa997783fa17
3 changes: 2 additions & 1 deletion trunk/drivers/media/dvb/ngene/ngene-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,6 @@ static void ngene_stop(struct ngene *dev)
static int ngene_start(struct ngene *dev)
{
int stat;
unsigned long flags;
int i;

pci_set_master(dev->pci_dev);
Expand Down Expand Up @@ -1337,6 +1336,8 @@ static int ngene_start(struct ngene *dev)
#ifdef CONFIG_PCI_MSI
/* enable MSI if kernel and card support it */
if (pci_msi_enabled() && dev->card_info->msi_supported) {
unsigned long flags;

ngwritel(0, NGENE_INT_ENABLE);
free_irq(dev->pci_dev->irq, dev);
stat = pci_enable_msi(dev->pci_dev);
Expand Down

0 comments on commit 675f26e

Please sign in to comment.