From 675f26ead358617c399344d60329174f2060a06f Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 31 Dec 2010 12:25:32 -0300 Subject: [PATCH] --- yaml --- r: 226421 b: refs/heads/master c: 4f77b86c665ff6a167edfdf152ebfa997783fa17 h: refs/heads/master i: 226419: 70489156757d0688c8bd7a8cb75f0f80b30150ab v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/ngene/ngene-core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 93a7d7ee3d37..88db5266d38c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d1da730ee17e712c25c0b1e51653048f92d2385 +refs/heads/master: 4f77b86c665ff6a167edfdf152ebfa997783fa17 diff --git a/trunk/drivers/media/dvb/ngene/ngene-core.c b/trunk/drivers/media/dvb/ngene/ngene-core.c index be71f915e2a3..dc073bdc623a 100644 --- a/trunk/drivers/media/dvb/ngene/ngene-core.c +++ b/trunk/drivers/media/dvb/ngene/ngene-core.c @@ -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); @@ -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);