aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/ngene/ngene-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index be71f915e2a3..dc073bdc623a 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -1304,7 +1304,6 @@ static void ngene_stop(struct ngene *dev)
1304static int ngene_start(struct ngene *dev) 1304static int ngene_start(struct ngene *dev)
1305{ 1305{
1306 int stat; 1306 int stat;
1307 unsigned long flags;
1308 int i; 1307 int i;
1309 1308
1310 pci_set_master(dev->pci_dev); 1309 pci_set_master(dev->pci_dev);
@@ -1337,6 +1336,8 @@ static int ngene_start(struct ngene *dev)
1337#ifdef CONFIG_PCI_MSI 1336#ifdef CONFIG_PCI_MSI
1338 /* enable MSI if kernel and card support it */ 1337 /* enable MSI if kernel and card support it */
1339 if (pci_msi_enabled() && dev->card_info->msi_supported) { 1338 if (pci_msi_enabled() && dev->card_info->msi_supported) {
1339 unsigned long flags;
1340
1340 ngwritel(0, NGENE_INT_ENABLE); 1341 ngwritel(0, NGENE_INT_ENABLE);
1341 free_irq(dev->pci_dev->irq, dev); 1342 free_irq(dev->pci_dev->irq, dev);
1342 stat = pci_enable_msi(dev->pci_dev); 1343 stat = pci_enable_msi(dev->pci_dev);