V4L/DVB: ngene: MSI cleanup
MSI cleanup. Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Родитель
5a2a1848a7
Коммит
478b3a42bd
|
@ -1300,8 +1300,10 @@ static void ngene_stop(struct ngene *dev)
|
||||||
ngwritel(0, NGENE_EVENT);
|
ngwritel(0, NGENE_EVENT);
|
||||||
ngwritel(0, NGENE_EVENT_HI);
|
ngwritel(0, NGENE_EVENT_HI);
|
||||||
free_irq(dev->pci_dev->irq, dev);
|
free_irq(dev->pci_dev->irq, dev);
|
||||||
|
#ifdef CONFIG_PCI_MSI
|
||||||
if (dev->msi_enabled)
|
if (dev->msi_enabled)
|
||||||
pci_disable_msi(dev->pci_dev);
|
pci_disable_msi(dev->pci_dev);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ngene_start(struct ngene *dev)
|
static int ngene_start(struct ngene *dev)
|
||||||
|
@ -1339,7 +1341,7 @@ static int ngene_start(struct ngene *dev)
|
||||||
|
|
||||||
#ifdef CONFIG_PCI_MSI
|
#ifdef CONFIG_PCI_MSI
|
||||||
/* enable MSI if kernel and card support it */
|
/* enable MSI if kernel and card support it */
|
||||||
if (dev->card_info->msi_supported) {
|
if (pci_msi_enabled() && dev->card_info->msi_supported) {
|
||||||
ngwritel(0, NGENE_INT_ENABLE);
|
ngwritel(0, NGENE_INT_ENABLE);
|
||||||
free_irq(dev->pci_dev->irq, dev);
|
free_irq(dev->pci_dev->irq, dev);
|
||||||
stat = pci_enable_msi(dev->pci_dev);
|
stat = pci_enable_msi(dev->pci_dev);
|
||||||
|
@ -1391,9 +1393,11 @@ static int ngene_start(struct ngene *dev)
|
||||||
fail:
|
fail:
|
||||||
ngwritel(0, NGENE_INT_ENABLE);
|
ngwritel(0, NGENE_INT_ENABLE);
|
||||||
free_irq(dev->pci_dev->irq, dev);
|
free_irq(dev->pci_dev->irq, dev);
|
||||||
|
#ifdef CONFIG_PCI_MSI
|
||||||
fail2:
|
fail2:
|
||||||
if (dev->msi_enabled)
|
if (dev->msi_enabled)
|
||||||
pci_disable_msi(dev->pci_dev);
|
pci_disable_msi(dev->pci_dev);
|
||||||
|
#endif
|
||||||
return stat;
|
return stat;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче